dynflow 1.8.0 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f067dee815c7352328f4a08c6cf7aa5f60c45e8c46ae0bb561ed3eff052a3f47
-  data.tar.gz: 37d1bf9a5bed948a9c0c966ac8649d6a1ba097801fcf3b3608a6f353e3b8cd14
+  metadata.gz: d4db626bf7deb1705c684ec0a1e4a0f55326129f94513076d0bd6eda7a8b61e7
+  data.tar.gz: 006b0a3e56c17c8c827f7375e761d1f47608b586d5fdbaaa3a16bc220b8879d6
 SHA512:
-  metadata.gz: 3eb25b7a20ac5022e0f1f32062ac6d7445d5fbe2fb482e5d34278a402f49e5feb53e6a7116f5fb06b1758faa6ea253fdda496e76d94dac0a6e2e497653c98fe8
-  data.tar.gz: 242ade0c666d77988957f473ed76aebef323f985adaa4a851c0620c14768fc19db7ef0087d0ab2d2983059aa0fd671721d377dfb9531d00c8f5a4a9b6a8380d2
+  metadata.gz: 8cb9a7044648545e5da5f1be5452d3170a1be2077207ccc83b85c2fd59523851bbe4a2e3cdef484cf6f02c41b82357373de11c4d41b7fb13802be0d1a49aa2c7
+  data.tar.gz: 91cb66bfddeb1044c52f2959d7c1d3f3e4ff4bf5b44dfa938ae1d48d07650e6a6c9169f9db6ab73ba0bf79d9bd0ce41235c6b1aecedc322a56f784466fa4bc05

data/dynflow.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rake"
   s.add_development_dependency "rack-test"
-  s.add_development_dependency "minitest"
+  s.add_development_dependency "minitest", "< 5.19"
   s.add_development_dependency "minitest-reporters"
   s.add_development_dependency "minitest-stub-const"
   s.add_development_dependency "activerecord"

data/examples/remote_executor.rb

@@ -168,10 +168,11 @@ elsif defined?(Sidekiq)
   Sidekiq.default_worker_options = { :retry => 0, 'backtrace' => true }
   # assuming the remote executor was required as part of initialization
   # of the ActiveJob worker
-  world = if Sidekiq.options[:queues].include?("dynflow_orchestrator")
+  queues = Sidekiq.configure_server { |c| c.options[:queues] }
+  world = if queues.include?("dynflow_orchestrator")
             RemoteExecutorExample.initialize_sidekiq_orchestrator
-          elsif (Sidekiq.options[:queues] - ['dynflow_orchestrator']).any?
+          elsif (queues - ['dynflow_orchestrator']).any?
             RemoteExecutorExample.initialize_sidekiq_worker
           end
-  Sidekiq.options[:dynflow_world] = world
+  Sidekiq.configure_server { |c| c.options[:dynflow_world] = world }
 end

data/lib/dynflow/action/v2/with_sub_plans.rb

@@ -130,7 +130,7 @@ module Dynflow::Action::V2
 
     def recalculate_counts
       total   = total_count
-      failed  = sub_plans_count('state' => %w(paused stopped), 'result' => 'error')
+      failed  = sub_plans_count('state' => %w(paused stopped), 'result' => %w(error warning))
       success = sub_plans_count('state' => 'stopped', 'result' => 'success')
       output.update(:pending_count => total - failed - success,
                     :failed_count  => failed - output.fetch(:resumed_count, 0),
@@ -173,6 +173,7 @@ module Dynflow::Action::V2
     def cancel!(force = false)
       # Count the not-yet-planned tasks as cancelled
       output[:cancelled_count] = total_count - output[:planned_count]
+      on_planning_finished if output[:cancelled_count].positive?
       # Pass the cancel event to running sub plans if they can be cancelled
       sub_plans(:state => 'running').each { |sub_plan| sub_plan.cancel(force) if sub_plan.cancellable? }
       suspend

data/lib/dynflow/executors/sidekiq/core.rb

@@ -9,7 +9,7 @@ require 'sidekiq-reliable-fetch'
 Sidekiq.configure_server do |config|
   # Use semi-reliable fetch
   # for details see https://gitlab.com/gitlab-org/sidekiq-reliable-fetch/blob/master/README.md
-  config.options[:semi_reliable_fetch] = true
+  config[:semi_reliable_fetch] = true
   Sidekiq::ReliableFetch.setup_reliable_fetch!(config)
 end
 

data/lib/dynflow/rails/configuration.rb

@@ -100,7 +100,7 @@ module Dynflow
       end
 
       def sidekiq_worker?
-        defined?(::Sidekiq) && ::Sidekiq.options[:queues].any?
+        defined?(::Sidekiq) && ::Sidekiq.configure_server { |c| c[:queues].any? }
       end
 
       def calculate_db_pool_size(world)
@@ -108,7 +108,7 @@ module Dynflow
 
         base_value = 5
         if defined?(::Sidekiq)
-          Sidekiq.options[:concurrency] + base_value
+          Sidekiq.configure_server { |c| c[:concurrency] } + base_value
         else
           world.config.queues.values.inject(base_value) do |pool_size, pool_options|
             pool_size += pool_options[:pool_size]
@@ -152,7 +152,7 @@ module Dynflow
           # we can't do any operation until the Rails.application.dynflow.world is set
           config.auto_execute        = false
           config.auto_validity_check = false
-          if sidekiq_worker? && !Sidekiq.options[:queues].include?("dynflow_orchestrator")
+          if sidekiq_worker? && !Sidekiq.configure_server { |c| c[:queues].include?("dynflow_orchestrator") }
             config.delayed_executor = nil
           end
         end
@@ -192,7 +192,7 @@ module Dynflow
         if remote?
           false
         else
-          if defined?(::Sidekiq) && Sidekiq.options[:dynflow_executor]
+          if defined?(::Sidekiq) && Sidekiq.configure_server { |c| c[:dynflow_executor] }
             ::Dynflow::Executors::Sidekiq::Core
           else
             ::Dynflow::Executors::Parallel::Core

data/lib/dynflow/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Dynflow
-  VERSION = '1.8.0'
+  VERSION = '1.8.2'
 end

data/lib/dynflow.rb

@@ -25,7 +25,7 @@ module Dynflow
     # @return [Dynflow::World, nil]
     def process_world
       return @process_world if defined? @process_world
-      @process_world = Sidekiq.options[:dynflow_world]
+      @process_world = Sidekiq.configure_server { |c| c.options[:dynflow_world] }
       raise "process world is not set" unless @process_world
       @process_world
     end