dynflow 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66a2413a7e81c765f74aa9ccde49270529b1edb9a664ec52a930993e285de290
-  data.tar.gz: fc2a618ac8d3b6959d3c01945568c2a5e6d0cb27103a46faca41dd65a50e27e4
+  metadata.gz: '00091e6971f6c6bbcc56f3a03564b2de6f437db1985375caa2171d3f9859a0f7'
+  data.tar.gz: e48ae6152594e70147b362b1e7ae4b0923cc645d38005af56b69c9e6f1cd5a31
 SHA512:
-  metadata.gz: 1c24fb1c72d23721664cc05823bbc0fe10638fbfa9f1956c68b859e6587c6c8a7c297b20a2427e4b75d1b540812b7e5370a34b5c8966d74398dea2f0607b6c0a
-  data.tar.gz: 0bba53b0d9f4327d86d03058e68856a7f7e4b9d64dd07c45e511bd71a7d232a566be7a5e7bfe52d3ce20aca758702f06530ba8faf4ae78826b5b85aa65b7cc6e
+  metadata.gz: e00b1eb7cf2bd103fe79d8a0e3046143f77548c380b2504b4fc3093b5c4a4929160f704f781e0565eacefb7cf493bd7b5ec6a8f5c2a5b0490e3f521285513a73
+  data.tar.gz: 1d3aef7335990a1ff72fecd0b36bb444227f0f216aaf44677d66d453a8d29b470a58e7d2ccee4349ba341a12a4ca14306d6d4c5167f5ac7e375c36fed19362cd

data/.travis.yml

@@ -2,6 +2,11 @@ sudo: false
 language:
   - ruby
 
+before_install: >-
+  if ruby -v | grep 'ruby 2.2'; then
+    gem install bundler -v '~> 1.17'
+  fi
+
 rvm:
   - "2.2.2"
   - "2.3.1"

data/lib/dynflow/action.rb

@@ -197,7 +197,6 @@ module Dynflow
     end
 
     def action_logger
-      phase! Executable
       world.action_logger
     end
 

data/lib/dynflow/executors.rb

@@ -12,6 +12,7 @@ module Dynflow
       yield
     ensure
       ::ActiveRecord::Base.clear_active_connections! if clear_connections
+      ::Logging.mdc.clear if defined? ::Logging
     end
 
   end

data/lib/dynflow/executors/parallel/pool.rb

@@ -4,19 +4,15 @@ module Dynflow
       class Pool < Actor
         class JobStorage
           def initialize
-            @round_robin = RoundRobin.new
-            @jobs        = Hash.new { |h, k| h[k] = [] }
+            @jobs = []
           end
 
           def add(work)
-            @round_robin.add work.execution_plan_id unless tracked?(work)
-            @jobs[work.execution_plan_id] << work
+            @jobs << work
           end
 
           def pop
-            return nil if empty?
-            execution_plan_id = @round_robin.next
-            @jobs[execution_plan_id].shift.tap { delete execution_plan_id if @jobs[execution_plan_id].empty? }
+            @jobs.shift
           end
 
           def queue_size
@@ -27,27 +23,15 @@ module Dynflow
             @jobs.empty?
           end
 
-          def execution_status(execution_plan_id = nil)
-            source = if execution_plan_id.nil?
-                       @jobs
-                     else
-                       { execution_plan_id => @jobs.fetch(execution_plan_id, []) }
-                     end
-            source.reduce({}) do |acc, (plan_id, work_items)|
-              acc.update(plan_id => work_items.count)
+          def queue_size(execution_plan_id = nil)
+            if execution_plan_id
+              @jobs.count do |item|
+                item.respond_to?(:execution_plan_id) && item.execution_plan_id == execution_plan_id
+              end
+            else
+              @jobs.size
             end
           end
-
-          private
-
-          def tracked?(work)
-            @jobs.has_key? work.execution_plan_id
-          end
-
-          def delete(execution_plan_id)
-            @round_robin.delete execution_plan_id
-            @jobs.delete execution_plan_id
-          end
         end
 
         def initialize(world, core, name, pool_size, transaction_adapter)
@@ -89,7 +73,7 @@ module Dynflow
         def execution_status(execution_plan_id = nil)
           { :pool_size => @pool_size,
             :free_workers => @free_workers.count,
-            :execution_status => @jobs.execution_status(execution_plan_id) }
+            :queue_size => @jobs.queue_size(execution_plan_id) }
         end
 
         private

data/lib/dynflow/version.rb

@@ -1,3 +1,3 @@
 module Dynflow
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.2.1'.freeze
 end

data/lib/dynflow/web/console.rb

@@ -41,9 +41,6 @@ module Dynflow
         load_worlds
         @executors.each do |w|
           hash = world.get_execution_status(w.data['id'], nil, 5).value!
-          hash.each do |_queue_name, info|
-            info[:queue_size] = info[:execution_status].values.reduce(:+) || 0
-          end
           w.data.update(:status => hash)
         end
         erb :worlds

data/test/executor_test.rb

@@ -594,12 +594,12 @@ module Dynflow
         let(:storage) { Dynflow::Executors::Parallel::Pool::JobStorage.new }
         it do
           storage.must_be_empty
-          storage.execution_status.must_equal({})
+          storage.queue_size.must_equal(0)
           storage.pop.must_be_nil
           storage.pop.must_be_nil
 
           storage.add s = FakeStep.new(1)
-          storage.execution_status.must_equal(1 => 1)
+          storage.queue_size.must_equal(1)
           storage.pop.must_equal s
           storage.must_be_empty
           storage.pop.must_be_nil
@@ -611,19 +611,19 @@ module Dynflow
           storage.add s22 = FakeStep.new(2)
           storage.add s31 = FakeStep.new(3)
 
-          storage.execution_status(1).must_equal(1 => 3)
-          storage.execution_status(4).must_equal(4 => 0)
-          storage.execution_status.must_equal({1 => 3, 2 => 2, 3 => 1})
+          storage.queue_size(1).must_equal(3)
+          storage.queue_size(4).must_equal(0)
+          storage.queue_size.must_equal(6)
 
-          storage.pop.must_equal s21
-          storage.pop.must_equal s31
           storage.pop.must_equal s11
-          storage.pop.must_equal s22
           storage.pop.must_equal s12
           storage.pop.must_equal s13
+          storage.pop.must_equal s21
+          storage.pop.must_equal s22
+          storage.pop.must_equal s31
 
           storage.must_be_empty
-          storage.execution_status.must_equal({})
+          storage.queue_size.must_equal(0)
           storage.pop.must_be_nil
         end
       end

data/test/world_test.rb

@@ -24,16 +24,16 @@ module Dynflow
 
       describe '#get_execution_status' do
         let(:base) do
-          { :default => { :pool_size => 5, :free_workers => 5, :execution_status => {} },
-            :slow => { :pool_size=> 1, :free_workers=> 1, :execution_status=> {}} }
+          { :default => { :pool_size => 5, :free_workers => 5, :queue_size => 0 },
+            :slow => { :pool_size=> 1, :free_workers=> 1, :queue_size => 0} }
         end
 
         it 'retrieves correct execution items count' do
           world.get_execution_status(world.id, nil, 5).value!.must_equal(base)
           id = 'something like uuid'
           expected = base.dup
-          expected[:default][:execution_status] = { id => 0 }
-          expected[:slow][:execution_status] = { id => 0 }
+          expected[:default][:queue_size] = 0
+          expected[:slow][:queue_size] =  0
           world.get_execution_status(world.id, id, 5).value!.must_equal(expected)
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Ivan Necas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-03 00:00:00.000000000 Z
+date: 2019-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json