dynflow 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1eddd0493e79287abacde548a9237bf6d13c0ec6f5d2e67d802a85de9be29db
-  data.tar.gz: f0826ba6cc0c8066a70d6c7b2cf5f11e5e7d29e1c96915057b4f099546fd1a16
+  metadata.gz: 7b7e50b6a77767c3cae603ef773f86c0ef218572ab37d4cf20eaa39a7baeb788
+  data.tar.gz: 3a38fce650541ffc1626a9eab628e0f4e2ccebf8a86ff8e25591ef334805293c
 SHA512:
-  metadata.gz: 7f2f82d41dbe9fa17ed1dc184dfaba98fc8e49ced49ec14ba523de6a4965b5ea0d9626d859b9f439647e47c1216a6d2b35a41d0dcb4a4e2d479e83cee736cd91
-  data.tar.gz: f362ca21ed154a5bd0b4ec5e5814cbb1fd48b78a51390bb17fb259d097fd5f12471c7022b85275ee4af3ee88e5efe2cc6dd199256ac6603bb13464c1ef1fe662
+  metadata.gz: aea5e2c7ef158cf395e10b7d487070772e9b3a58f72feaea97c12b90c7ad680f69c039a0f443a938f160feceb3993d58bb9eadc91e0be933d6cee43172a35e40
+  data.tar.gz: db00fb0a44f91871d6b0a3b39b6c4d8da7ffe3eaa363ee816e1de95aae576991a83c24a62ecb45212626fdb7de4de3342d84c5ca4fb2c7c766d0c5688301320e

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

@@ -102,7 +102,7 @@ module Dynflow::Action::V2
 
     def increase_counts(planned, failed)
       output[:planned_count] += planned + failed
-      output[:failed_count]  = output.fetch(:failed_count, 0) + failed
+      output[:failed_count] = output.fetch(:failed_count, 0) + failed
       output[:pending_count] = output.fetch(:pending_count, 0) + planned
       output[:success_count] ||= 0
     end
@@ -129,12 +129,20 @@ module Dynflow::Action::V2
     end
 
     def recalculate_counts
-      total   = total_count
-      failed  = sub_plans_count('state' => %w(paused stopped), 'result' => %w(error warning))
+      total = total_count
+      if output[:cancelled_timestamp]
+        cancelled_scheduled_plans = sub_plans_count_after(output[:cancelled_timestamp], { 'state' => %w(paused stopped), 'result' => %w(error warning) })
+        cancelled_unscheduled_plans = total_count - output[:planned_count]
+        cancelled = cancelled_unscheduled_plans + cancelled_scheduled_plans
+      else
+        cancelled = cancelled_scheduled_plans = 0
+      end
+      failed = sub_plans_count('state' => %w(paused stopped), 'result' => %w(error warning)) - cancelled_scheduled_plans
       success = sub_plans_count('state' => 'stopped', 'result' => 'success')
-      output.update(:pending_count => total - failed - success,
-                    :failed_count  => failed - output.fetch(:resumed_count, 0),
-                    :success_count => success)
+      output.update(:pending_count => total - failed - success - cancelled_scheduled_plans,
+        :failed_count => failed - output.fetch(:resumed_count, 0),
+        :success_count => success,
+        :cancelled_count => cancelled)
     end
 
     def counts_set?
@@ -142,7 +150,7 @@ module Dynflow::Action::V2
     end
 
     def check_for_errors!
-      raise SubtaskFailedException.new("A sub task failed") if output[:failed_count] > 0
+      raise SubtaskFailedException.new("A sub task failed") if output[:failed_count] + output[:cancelled_count] > 0
     end
 
     # Helper for creating sub plans
@@ -173,6 +181,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]
+      output[:cancelled_timestamp] ||= Time.now.utc.iso8601 # time in UTC for comparison with UTC times in the database
       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? }
@@ -198,7 +207,9 @@ module Dynflow::Action::V2
     end
 
     def remaining_count
-      total_count - output[:cancelled_count] - output[:planned_count]
+      return 0 if output[:cancelled_timestamp]
+
+      total_count - output[:planned_count]
     end
 
     private
@@ -216,5 +227,9 @@ module Dynflow::Action::V2
     def sub_plans_count(filter = {})
       world.persistence.find_execution_plan_counts(filters: sub_plan_filter.merge(filter))
     end
+
+    def sub_plans_count_after(timestamp, filter = {})
+      world.persistence.find_execution_plan_counts_after(timestamp, { filters: sub_plan_filter.merge(filter) })
+    end
   end
 end

data/lib/dynflow/persistence.rb

@@ -73,6 +73,10 @@ module Dynflow
       adapter.find_execution_plan_counts(options)
     end
 
+    def find_execution_plan_counts_after(timestamp, options)
+      adapter.find_execution_plan_counts_after(timestamp, options)
+    end
+
     def delete_execution_plans(filters, batch_size = 1000, enforce_backup_dir = nil)
       backup_dir = enforce_backup_dir || current_backup_dir
       adapter.delete_execution_plans(filters, batch_size, backup_dir)

data/lib/dynflow/persistence_adapters/abstract.rb

@@ -46,6 +46,10 @@ module Dynflow
         filter(:execution_plan, options[:filters]).count
       end
 
+      def find_execution_plan_counts_after(timestamp, options = {})
+        raise NotImplementedError
+      end
+
       def find_execution_plan_statuses(options)
         raise NotImplementedError
       end

data/lib/dynflow/persistence_adapters/sequel.rb

@@ -78,6 +78,10 @@ module Dynflow
         filter(:execution_plan, table(:execution_plan), options[:filters]).count
       end
 
+      def find_execution_plan_counts_after(timestamp, options = {})
+        filter(:execution_plan, table(:execution_plan), options[:filters]).filter(::Sequel.lit('ended_at >= ?', timestamp)).count
+      end
+
       def find_execution_plan_statuses(options)
         plans = filter(:execution_plan, table(:execution_plan), options[:filters])
                 .select(:uuid, :state, :result)

data/lib/dynflow/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Ivan Necas
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-11 00:00:00.000000000 Z
+date: 2025-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: algebrick
@@ -683,7 +683,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: DYNamic workFLOW engine