dynflow 1.6.7 → 1.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d535120af429db7ce30df6651ffc033d20e481f9c23652b96298cd53e5de2d7
-  data.tar.gz: 0d5c5f4f983bde9ce13afebb26c311673513c8a560fbde22b3472e67f468d770
+  metadata.gz: 79387ebdc9ad0bbae88897885da885483c4d57e08af9be69f6f2369be67bbe5b
+  data.tar.gz: aa5413ff3913decab84dc70e86f94f4293acfcc16340e7ad6216abf9943335b1
 SHA512:
-  metadata.gz: 81de21466f1ec2a76ec3396b06256dc873cdfdea62d6d39035e284a5f2e8ea5ed81783202163e86a0dcd38f841333c08de92c52989bc768e9763c9eedcab8e59
-  data.tar.gz: cf8c24e19b30475a5325c2e219657dbb625d7d42704250e1f8c001846f1d98c9a74ccb80c83c806c89c0a2f7944577ba8741d0ad963d8c0fb16cd7561af41940
+  metadata.gz: 99132ff502c108b47595d211caba78c3034adb05390937269814d09a8da67c546b9bc2e7a2c776bcba0596d76ee50b7229c7497aad77e2d2483c43351d4a65a5
+  data.tar.gz: 52e2bb51d1fdc668c8837646635c37c58c65761d5ef3812294838dfacc54dfc48ae26550bd132a077dfc8579ee4fa86787fe17d27f45389a6a536328276de897

data/lib/dynflow/action/with_sub_plans.rb

@@ -3,6 +3,12 @@ module Dynflow
   module Action::WithSubPlans
     include Dynflow::Action::Cancellable
 
+    class SubtaskFailedException < RuntimeError
+      def backtrace
+        []
+      end
+    end
+
     SubPlanFinished = Algebrick.type do
       fields! :execution_plan_id => String,
               :success           => type { variants TrueClass, FalseClass }
@@ -228,7 +234,7 @@ module Dynflow
     end
 
     def check_for_errors!
-      fail "A sub task failed" if output[:failed_count] > 0
+      raise SubtaskFailedException.new("A sub task failed") if output[:failed_count] > 0
     end
 
     def uses_concurrency_control

data/lib/dynflow/director.rb

@@ -167,7 +167,7 @@ module Dynflow
       @logger = world.logger
       @execution_plan_managers = {}
       @rescued_steps = {}
-      @planning_plans = []
+      @planning_plans = Set.new
     end
 
     def current_execution_plan_ids
@@ -175,6 +175,8 @@ module Dynflow
     end
 
     def handle_planning(execution_plan_uuid)
+      return [] if @planning_plans.include? execution_plan_uuid
+
       @planning_plans << execution_plan_uuid
       [PlanningWorkItem.new(execution_plan_uuid, :default, @world.id)]
     end

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

@@ -85,6 +85,9 @@ module Dynflow
           logger.info('Performing validity checks')
           @world.perform_validity_checks
           logger.info('Finished performing validity checks')
+          if @world.delayed_executor && !@world.delayed_executor.started?
+            @world.delayed_executor.start
+          end
           @recovery = false
         end
 

data/lib/dynflow/persistence_adapters/sequel.rb

@@ -335,6 +335,8 @@ module Dynflow
         if value
           record = prepare_record(what, value, (existing_record || condition), with_data)
           if existing_record
+            record = prune_unchanged(what, existing_record, record)
+            return value if record.empty?
             condition = update_conditions.merge(condition)
             return with_retry { table.where(condition).update(record) }
           else
@@ -356,6 +358,14 @@ module Dynflow
         end
       end
 
+      def prune_unchanged(what, object, record)
+        record = record.dup
+        table(what).columns.each do |column|
+          record.delete(column) if object[column] == record[column]
+        end
+        record
+      end
+
       alias_method :load, :load_record
 
       def load_records(what, condition, keys = nil)

data/lib/dynflow/rails/configuration.rb

@@ -152,6 +152,9 @@ 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")
+            config.delayed_executor = nil
+          end
         end
       end
 

data/lib/dynflow/rails.rb

@@ -46,6 +46,9 @@ module Dynflow
             invalidated_worlds = world.perform_validity_checks
             world.auto_execute
             world.post_initialization if invalidated_worlds > 0
+            if @world.delayed_executor && !@world.delayed_executor.started?
+              @world.delayed_executor.start
+            end
             config.run_post_executor_init_hooks(world)
           end
         end

data/lib/dynflow/testing/dummy_world.rb

@@ -5,7 +5,7 @@ module Dynflow
       extend Mimic
       mimic! World
 
-      attr_reader :clock, :executor, :middleware, :coordinator
+      attr_reader :clock, :executor, :middleware, :coordinator, :delayed_executor
       attr_accessor :action
 
       def initialize(_config = nil)

data/lib/dynflow/version.rb

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

data/lib/dynflow/world.rb

@@ -77,7 +77,7 @@ module Dynflow
       @delayed_executor ||= try_spawn(:delayed_executor, Coordinator::DelayedExecutorLock)
       @execution_plan_cleaner ||= try_spawn(:execution_plan_cleaner, Coordinator::ExecutionPlanCleanerLock)
       update_register
-      @delayed_executor.start if @delayed_executor && !@delayed_executor.started?
+      @delayed_executor.start if auto_validity_check && @delayed_executor && !@delayed_executor.started?
       self.auto_execute if @config.auto_execute
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 1.6.7
+  version: 1.6.10
 platform: ruby
 authors:
 - Ivan Necas
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-25 00:00:00.000000000 Z
+date: 2023-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -678,7 +678,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.20
 signing_key:
 specification_version: 4
 summary: DYNamic workFLOW engine