dynflow 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f162fe5b456a60898fad5ea4f3eec20ee1301f4adc8e4939946b03962b0ce12d
-  data.tar.gz: 591f53a8eafe2f94f61c5988fdc02d39ee8405726522a458394cfaa5dd3a260e
+  metadata.gz: 36610c9601830c752e4cf36716d91b8fc2703d16796d5812e550440a6f0a0b76
+  data.tar.gz: 149131675b4b1f0f2858b4ebd59d3b9ac2fbc74404194c738d3f2ac90944d86d
 SHA512:
-  metadata.gz: 41345060fa6037bd1d10f9f6c3515ffe495b131e71744a8820d112f0547f21426b3829de522d1d4571cc4beecfde12f350f080f83fa62ec1be67652a976ef49d
-  data.tar.gz: 7ecec4743683c885c4e98caf978d1cd75d0647da11d88baab5b051fffa0192ee727d6feef1d61fbc1906f874f412f5486a9eb516e5a7aeded9c343de2f6df25d
+  metadata.gz: 06bc662c810b038ae134f04550e44b6a5d0d8de46241487d1cb61a7ebc08ba09e9b0f16024ccd0150f2621188afe39197f88cc161dd6814b7dd35a0a9d0de69e
+  data.tar.gz: ab4b95daedddcf60b52af392d83eff308eca24a0ff621bdfd8c7f334fd7268531585bba4df83eba8207a03eaa05efc6d276ffb01435146c2d6b83beacd9f593b

data/examples/termination.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+
+require_relative 'example_helper'
+
+class Sleeper < Dynflow::Action
+  def run(event = nil)
+    sleep
+  end
+end
+
+def report(msg)
+  puts "===== #{Time.now}: #{msg}"
+end
+
+if $0 == __FILE__
+  ExampleHelper.world.action_logger.level = 1
+  ExampleHelper.world.logger.level = 0
+
+  ExampleHelper.world.trigger(Sleeper)
+  report "Sleeping"
+  sleep 5
+
+  report "Asking to terminate"
+  ExampleHelper.world.terminate.wait
+  report "Terminated"
+end

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

@@ -95,10 +95,14 @@ module Dynflow
         private
 
         def try_to_terminate
-          if terminating? && @free_workers.size == @pool_size
+          if terminating?
             @free_workers.map { |worker| worker.ask(:terminate!) }.map(&:wait)
-            @executor_core.tell([:finish_termination, @name])
-            finish_termination
+            @pool_size -= @free_workers.count
+            @free_workers = []
+            if @pool_size.zero?
+              @executor_core.tell([:finish_termination, @name])
+              finish_termination
+            end
           end
         end
 

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

@@ -9,16 +9,17 @@ module Dynflow
         end
 
         def on_message(work_item)
-          already_responded = false
+          ok = false
           Executors.run_user_code do
             work_item.execute
+            ok = true
           end
         rescue Errors::PersistenceError => e
           @pool.tell([:handle_persistence_error, reference, e, work_item])
-          already_responded = true
+          ok = false
         ensure
           Dynflow::Telemetry.with_instance { |t| t.increment_counter(:dynflow_worker_events, 1, @telemetry_options) }
-          @pool.tell([:worker_done, reference, work_item]) unless already_responded
+          @pool.tell([:worker_done, reference, work_item]) if ok
         end
       end
     end

data/lib/dynflow/version.rb

@@ -1,3 +1,3 @@
 module Dynflow
-  VERSION = '1.1.3'.freeze
+  VERSION = '1.1.4'.freeze
 end

data/lib/dynflow/world.rb

@@ -332,6 +332,7 @@ module Dynflow
         @terminating = Concurrent.future do
           termination_future.wait(termination_timeout)
         end.on_completion do
+          @terminated.complete
           Thread.new { Kernel.exit } if @exit_on_terminate.true?
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Ivan Necas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-28 00:00:00.000000000 Z
+date: 2018-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -379,6 +379,7 @@ files:
 - examples/singletons.rb
 - examples/sub_plan_concurrency_control.rb
 - examples/sub_plans.rb
+- examples/termination.rb
 - extras/statsd_mapping.conf
 - lib/dynflow.rb
 - lib/dynflow/action.rb

data/web/assets/images/logo-square.png

@@ -1 +0,0 @@
-web/assets/images/../../../doc/pages/source/images/logo-square.png