dynflow 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 111e155822b2ec8d00a8f0e249ce1333f6d4e826bb10247e172a523e7212a9d6
-  data.tar.gz: 4969844384cd6ea8add967e10495cc534bee36dbbe4fe5a9b978ecd8c09d802c
+SHA1:
+  metadata.gz: 35bd7c7bd52da4f68946edb03d5d388d09f53cea
+  data.tar.gz: 35800095dee5a7edc92ed87d605edc66e8190c34
 SHA512:
-  metadata.gz: 65b612808157a76872102e4070bbb0b0ca8e23d9eba4f032a7881d67b884f33be74dc0fc7fbbcd458d15be675e33f10ba00c0fb24e4c3e237a69e7ae27558104
-  data.tar.gz: 66c6e35276566b7d239a25c5f95e8b52331e70aa32f36a36027c3fbf64d64069f611b8ffaab3caac5a89bf370a4c6fadc3bb5736de8bde9d3b7f50bf7a962149
+  metadata.gz: 2415804bf8a2c1a0b502db7bf685915aa7ae90365bd3316db269bdd187fa0d98357e1452181f23cbcf779c495fa4293046336a5ae700926b59566d9f47fe0187
+  data.tar.gz: 9fb0b84f75bcc2055d523d61a706393eeb14479ce5939b73ec0d3b242aaf888c3a129a561acea88b598bcf3954b99deae3ea4919eede8b04f729e33b3dc6b528

data/lib/dynflow/delayed_executors/abstract_core.rb

@@ -46,8 +46,12 @@ module Dynflow
       def process(delayed_plans, check_time)
         processed_plan_uuids = []
         delayed_plans.each do |plan|
+          fix_plan_state(plan)
           with_error_handling do
-            if !plan.start_before.nil? && plan.start_before < check_time
+            if plan.execution_plan.state != :scheduled
+              # in case the previous process was terminated after running the plan, but before deleting the delayed plan record.
+              @logger.info("Execution plan #{plan.execution_plan_uuid} is expected to be in 'scheduled' state, was '#{plan.execution_plan.state}', skipping")
+            elsif !plan.start_before.nil? && plan.start_before < check_time
               @logger.debug "Failing plan #{plan.execution_plan_uuid}"
               plan.timeout
             else
@@ -63,6 +67,16 @@ module Dynflow
         world.persistence.delete_delayed_plans(:execution_plan_uuid => processed_plan_uuids) unless processed_plan_uuids.empty?
       end
 
+      private
+
+      # handle the case, where the process was termintated while planning was in progress before
+      def fix_plan_state(plan)
+        if plan.execution_plan.state == :planning
+          @logger.info("Execution plan #{plan.execution_plan_uuid} is expected to be in 'scheduled' state, was '#{plan.execution_plan.state}', auto-fixing")
+          plan.execution_plan.set_state(:scheduled, true)
+          plan.execution_plan.save
+        end
+      end
     end
   end
 end

data/lib/dynflow/executors.rb

@@ -8,9 +8,10 @@ module Dynflow
     # we should wrap it with this method, and we can ensure here to do
     # necessary cleanup, such as cleaning ActiveRecord connections
     def self.run_user_code
+      clear_connections = defined?(::ActiveRecord) && ActiveRecord::Base.connected? && ActiveRecord::Base.connection.open_transactions.zero?
       yield
     ensure
-      ::ActiveRecord::Base.clear_active_connections! if defined? ::ActiveRecord
+      ::ActiveRecord::Base.clear_active_connections! if clear_connections
     end
 
   end

data/lib/dynflow/version.rb

@@ -1,3 +1,3 @@
 module Dynflow
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

data/test/future_execution_test.rb

@@ -25,6 +25,20 @@ module Dynflow
         end
         let(:execution_plan) { delayed_plan.execution_plan }
 
+        describe 'abstract executor' do
+          let(:abstract_delayed_executor) { DelayedExecutors::AbstractCore.new(world) }
+
+          it 'handles wrong plan state' do
+            delayed_plan.execution_plan.state = :planning
+            abstract_delayed_executor.send(:process, [delayed_plan], @start_at)
+            delayed_plan.execution_plan.state.must_equal :planned
+
+            delayed_plan.execution_plan.set_state(:running, true)
+            abstract_delayed_executor.send(:process, [delayed_plan], @start_at)
+            delayed_plan.execution_plan.state.must_equal :running
+          end
+        end
+
         it 'returns the progress as 0' do
           execution_plan.progress.must_equal 0
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ivan Necas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-29 00:00:00.000000000 Z
+date: 2018-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -602,7 +602,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: DYNamic workFLOW engine