dynflow 1.6.8 → 1.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8f8620a4de5e01dbd253d659f07f4221a41a88112c7ca9b1440591bfc0a7b2f
-  data.tar.gz: 13d941834dc18889bef6c0bf8bee95f5286104974fa0ded2bb9a5ffda6f6ea81
+  metadata.gz: db2725603e440298025d434778ebf2e218e6c3e30fb7db07aaddea80648cbb2d
+  data.tar.gz: 4d8003de94bec301bd411c1c3ee92df9e1d10cc45bc36d4d843a75c2eb664171
 SHA512:
-  metadata.gz: f84d05b76492e25562a8cb06628bfd69f8d7f5a28b62d9bdd97469db206c8d0378209609376283c21fa664a7b13587df1babc828f92f15e58e95fe5ad411a85c
-  data.tar.gz: fbb2db621fb8903f314cb061258230b5c0567c4aaf6beb8e051027f4206c2a14ed2c734b90160437060c5fa36823c7febb946d7b41d5d974d798b58410e083e5
+  metadata.gz: ab0fa706aa8b41c1197aef44bf57a87f4e5c37d7d343a9ca7e83e20af8de89b4e0fb2e72e7a1b93fffa05ac3265c78a48d598d7b8e0292785cd2276057edd0f0
+  data.tar.gz: 07e82b78806a61511b0ddff0240dd596172dfe79735bc8b931d7972b4d322d29bca1686be8be0087a105171e7348c0ee24cfdb2b01cc1a8dcf8d97ad8b0134c8

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

@@ -393,11 +393,11 @@ module Dynflow
         hash = if record[:data].nil?
                  SERIALIZABLE_COLUMNS.fetch(what, []).each do |key|
                    key = key.to_sym
-                   record[key] = MessagePack.unpack((record[key])) unless record[key].nil?
+                   record[key] = MessagePack.unpack(record[key].to_s) unless record[key].nil?
                  end
                  record
                else
-                 MessagePack.unpack(record[:data])
+                 MessagePack.unpack(record[:data].to_s)
                end
         Utils.indifferent_hash(hash)
       end

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.8'
+  VERSION = '1.6.11'
 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
 

data/test/persistence_test.rb

@@ -464,6 +464,27 @@ module Dynflow
           loaded_plan = adapter.load_execution_plan(plan[:id])
           assert_equal_attributes!(plan_data, loaded_plan)
         end
+
+        it 'does not leak Sequel blobs' do
+          db = adapter.send(:db)
+          # Prepare records for saving
+          plan = prepare_plans.first
+
+          value = 'a' * 1000
+
+          adata = action_data.merge({:output => { :key => value }})
+          plan_record = adapter.send(:prepare_record, :execution_plan, plan.merge(:uuid => plan[:id]))
+          action_record = adapter.send(:prepare_record, :action, adata.dup)
+
+          # Insert the records
+          db[:dynflow_execution_plans].insert plan_record.merge(:uuid => plan[:id])
+          db[:dynflow_actions].insert action_record.merge(:execution_plan_uuid => plan[:id], :id => adata[:id])
+
+          # Load the saved records
+          loaded_action = adapter.load_action(plan[:id], adata[:id])
+          _(loaded_action[:output][:key].class).must_equal String
+          _(loaded_action[:output][:key]).must_equal value
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 1.6.8
+  version: 1.6.11
 platform: ruby
 authors:
 - Ivan Necas
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-06 00:00:00.000000000 Z
+date: 2023-05-09 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.3.20
+rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
 summary: DYNamic workFLOW engine