dynflow 1.8.3 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b735fbb2453eb09dbab54199dae5cb8c453136bbee0fda91469372f72b9e776f
-  data.tar.gz: 2a8318ae444f8330ed116ca278156f92e9003804bbaffc025003a567891974f4
+  metadata.gz: 2bf4beeafa28798576c07fd3fcabd039c026bee7457270426152c6a80be5b86a
+  data.tar.gz: 2ff9ad272fa222d27f4103188b98809edbe150e92ce18a573442215d8cc06b57
 SHA512:
-  metadata.gz: 74bd6c057a5b6398adca1e3aef5f0b304899c070f11abf02b404df3f19ea479a9b18934939798867bfb0d39c6226c605f621600b3466dd1f2f1e34dc44a1cf7c
-  data.tar.gz: a462206856f16910092683641f1e7fa721714f3da7b821b86811a95073b2cc860a1ac082e42de9f4913317ef2e72e8d759cd63f9dcbd9604c62036f0c59527aa
+  metadata.gz: cb049c6b32cf7a84bce0e616c64648ab13fecbb131233f7ae9a64b5308f3961cee00786b2ca0794bb764a2d42b488a4014b52da5d8de632887834230638e8145
+  data.tar.gz: 4dd52c5e4c1e8644be534a0e48209c17a12ee03c358d81fdefd52b884b8d3b96c2f89417e46790544f68fe80a3004d209a12f2d0954393bb6dd65a4e82b6579e

data/lib/dynflow/coordinator.rb

@@ -145,6 +145,10 @@ module Dynflow
         raise "Can't acquire the lock after deserialization" if @from_hash
         Type! owner_id, String
       end
+
+      def unlock_on_shutdown?
+        true
+      end
     end
 
     class LockByWorld < Lock
@@ -289,6 +293,10 @@ module Dynflow
       def request_id
         @data[:request_id]
       end
+
+      def unlock_on_shutdown?
+        false
+      end
     end
 
     class PlanningLock < LockByWorld
@@ -305,6 +313,10 @@ module Dynflow
       def execution_plan_id
         @data[:execution_plan_id]
       end
+
+      def unlock_on_shutdown?
+        false
+      end
     end
 
     attr_reader :adapter
@@ -320,8 +332,12 @@ module Dynflow
       if block
         begin
           block.call
+        # We are looking for ::Sidekiq::Shutdown, but that may not be defined. We rely on it being a subclass of Interrupt
+        # We don't really want to rescue it, but we need to bind it somehow so that we can check it in ensure
+        rescue Interrupt => e
+          raise e
         ensure
-          release(lock)
+          release(lock) if !(defined?(::Sidekiq) && e.is_a?(::Sidekiq::Shutdown)) || lock.unlock_on_shutdown?
         end
       end
     rescue DuplicateRecordError => e
@@ -333,8 +349,8 @@ module Dynflow
       adapter.delete_record(lock)
     end
 
-    def release_by_owner(owner_id)
-      find_locks(owner_id: owner_id).map { |lock| release(lock) }
+    def release_by_owner(owner_id, on_termination = false)
+      find_locks(owner_id: owner_id).map { |lock| release(lock) if !on_termination || lock.unlock_on_shutdown? }
     end
 
     def find_locks(filter_options)
@@ -379,9 +395,9 @@ module Dynflow
       create_record(world)
     end
 
-    def delete_world(world)
+    def delete_world(world, on_termination = false)
       Type! world, Coordinator::ClientWorld, Coordinator::ExecutorWorld
-      release_by_owner("world:#{world.id}")
+      release_by_owner("world:#{world.id}", on_termination)
       delete_record(world)
     end
 

data/lib/dynflow/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dynflow
-  VERSION = '1.8.3'
+  VERSION = '1.8.4'
 end

data/lib/dynflow/world/invalidation.rb

@@ -117,7 +117,14 @@ module Dynflow
       # @return [Integer] number of invalidated worlds
       def perform_validity_checks
         world_invalidation_result = worlds_validity_check
-        locks_validity_check
+        locks_validity_check.each do |lock|
+          case lock
+          when ::Dynflow::Coordinator::PlanningLock
+            invalidate_planning_lock(lock)
+          when ::Dynflow::Coordinator::ExecutionLock
+            invalidate_execution_lock(lock)
+          end
+        end
         pruned = connector.prune_undeliverable_envelopes(self)
         logger.error("Pruned #{pruned} undeliverable envelopes") unless pruned.zero?
         world_invalidation_result.values.select { |result| result == :invalidated }.size

data/lib/dynflow/world.rb

@@ -344,7 +344,7 @@ module Dynflow
               clock.ask(:terminate!).wait(termination_timeout)
             end
 
-            coordinator.delete_world(registered_world)
+            coordinator.delete_world(registered_world, true)
             @terminated.resolve
             true
           rescue => e

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.configure_server { |c| c.options[:dynflow_world] }
+      @process_world = Sidekiq.configure_server { |c| c[:dynflow_world] }
       raise "process world is not set" unless @process_world
       @process_world
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.4
 platform: ruby
 authors:
 - Ivan Necas
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-05 00:00:00.000000000 Z
+date: 2024-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: algebrick
@@ -682,7 +682,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: DYNamic workFLOW engine