dynflow 0.8.34 → 0.8.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7ff5e3fce545cac6d1d299717c2fa11b54ba9ef6
-  data.tar.gz: 90214fe9c441dfae1780f591cca27de7eaa89da3
+SHA256:
+  metadata.gz: 290e1bf999cae6f5ced255f29c2b62bc5d1fb53d75a0184ca514afbd3deb9c04
+  data.tar.gz: 7e4bdad4c493342902070fa5f694569ff3cd1906c648bc403b47dccb03654646
 SHA512:
-  metadata.gz: e1084dc1ef5c5d8d923df3fc92d93b1b6e92edd85d29ab4fd5fe045908315a692b2cbf62615d0d34aedbf18b077d522b9eff4b368944c31c5689d1f8484820d2
-  data.tar.gz: eb449ff93ccc6720e13a4cc539dbec6a1296a4d81d58b3a4129a2ef8530fae769c0a68fe870317d0775fe094919de460d4c719c5bcc2a1318ee3b7939c90a9d7
+  metadata.gz: 50250e41adda66f5f8069378d916fa1a58771076420806aa9185bbd2467a36acb038aeda64f3d7757c43801796c2507e23e062307bb40e9fd5ddaed18c0a5236
+  data.tar.gz: 0aeae17937111257652845446f8ea5726d735651a57dd3d915f74e943a785566eb9340b5e1356e45bac86c2fe15033dff2e6b8fab50ae17aa05abe2bc32e4749

data/lib/dynflow/action/with_bulk_sub_plans.rb

@@ -58,7 +58,7 @@ module Dynflow
 
     # The same logic as in Action::WithSubPlans, but calculated using the expected total count
     def run_progress
-      if counts_set?
+      if counts_set? && total_count > 0
         sum = output.values_at(:success_count, :cancelled_count, :failed_count).reduce(:+)
         sum.to_f / total_count
       else

data/lib/dynflow/delayed_executors/abstract_core.rb

@@ -38,7 +38,8 @@ module Dynflow
       def with_error_handling(error_retval = nil, &block)
         block.call
       rescue Exception => e
-        @logger.fatal e.backtrace.join("\n")
+        @logger.warn e.message
+        @logger.debug e.backtrace.join("\n")
         error_retval
       end
 

data/lib/dynflow/execution_plan/steps/abstract.rb

@@ -154,11 +154,19 @@ module Dynflow
         @started_at ||= start
         block.call
       ensure
-        @progress_done, @progress_weight = action.calculated_progress
+        calculate_progress(action)
         @ended_at        = Time.now
         @execution_time += @ended_at - start
         @real_time       = @ended_at - @started_at
       end
+
+      def calculate_progress(action)
+        @progress_done, @progress_weight = action.calculated_progress
+        if @progress_done.is_a?(Float) && !@progress_done.finite?
+          action_logger.error("Unexpected progress value #{@progress_done} for step #{execution_plan_id}##{id}")
+          @progress_done = 0
+        end
+      end
     end
   end
 end

data/lib/dynflow/version.rb

@@ -1,3 +1,3 @@
 module Dynflow
-  VERSION = '0.8.34'
+  VERSION = '0.8.35'
 end

data/test/action_test.rb

@@ -619,6 +619,7 @@ module Dynflow
 
       describe ::Dynflow::Action::WithPollingSubPlans do
         include TestHelpers
+        include Testing
 
         let(:clock) { Dynflow::Testing::ManagedClock.new }
 
@@ -627,8 +628,8 @@ module Dynflow
             total = 2
             plan = world.plan(PollingParentAction, count: total)
             plan.state.must_equal :planned
-            world.execute(plan.id)
             clock.pending_pings.count.must_equal 0
+            world.execute(plan.id)
             wait_for do
               plan.sub_plans_count == total &&
                 plan.sub_plans.all? { |sub| sub.result == :success }
@@ -674,6 +675,11 @@ module Dynflow
           end
         end
 
+        it 'handles empty sub plans when calculating progress' do
+          action = create_and_plan_action(PollingBulkParentAction, :count => 0)
+          action.run_progress.must_equal 0.1
+        end
+
         describe ::Dynflow::Action::Singleton do
           include TestHelpers
 

data/test/semaphores_test.rb

@@ -61,7 +61,7 @@ module Dynflow
     end
 
     describe ::Dynflow::Semaphores::Aggregating do
-      let(:klass) { ::Dynflow::Semaphores::Aggregating }
+      let(:semaphore_class) { ::Dynflow::Semaphores::Aggregating }
       let(:child_class) { ::Dynflow::Semaphores::Stateful }
       let(:children) do
         {
@@ -77,7 +77,7 @@ module Dynflow
       end
 
       it 'can be used as counter' do
-        semaphore = klass.new(children)
+        semaphore = semaphore_class.new(children)
         assert_semaphore_state semaphore, 3, 2
         semaphore.get.must_equal 1
         assert_semaphore_state semaphore, 2, 1

data/test/test_helper.rb

@@ -2,6 +2,7 @@ require 'bundler/setup'
 require 'minitest/reporters'
 require 'minitest/autorun'
 require 'minitest/spec'
+ENV['MT_NO_PLUGINS'] = 'true'
 
 MiniTest::Reporters.use! if ENV['RM_INFO']
 
@@ -192,8 +193,10 @@ module TestHelpers
       executor_id_for_plan(triggered.id)
     end
 
+    plan = client_world.persistence.load_execution_plan(triggered.id)
+    step = plan.steps.values.last
     wait_for do
-      client_world.persistence.load_execution_plan(triggered.id).state == :running
+      client_world.persistence.load_step(step.execution_plan_id, step.id, client_world).state == :suspended
     end
 
     executor = WorldFactory.created_worlds.find { |e| e.id == executor_id }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 0.8.34
+  version: 0.8.35
 platform: ruby
 authors:
 - Ivan Necas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-14 00:00:00.000000000 Z
+date: 2018-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -594,7 +594,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: DYNamic workFLOW engine