katello 4.1.0.rc1 → 4.1.0.rc1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc20921c082e7725e89028befc8b8e9469b5088304795b5cbeb4cfc9bc343866
-  data.tar.gz: aee4945d14f0e66a96d516eb3e47ee0e93fc02d9bb7384e28f5d360646a73a88
+  metadata.gz: 8fa898f182416d7da9cfa56ef84ea10f11e4a18981202e4ba0ad65367408a4ca
+  data.tar.gz: e917344f18c0c835e31acc4463bfff10808a41e66fad2c3f9d833c55c234abae
 SHA512:
-  metadata.gz: b868b400fb3a0be4e7db0755700b45b5388e4c433a447dfe335c7bc156f40b5dc557fce7553aa79fa2eaa61bb83e0ceae3c27cbb7deb2458efb15f7ac890df22
-  data.tar.gz: 550c55ae8bec58857cfa5b75d33579f9c9de56013a58f273487fdccdf9378890f2d47ac257fdf8b2b29a89fd648cdd8e668725358b169dcf35f0277d7758e0a3
+  metadata.gz: 98470123a70cff266bec4e69e281bba4b492192ff815d57f92f1a1decadbbff15aeabbe5b02abd97c7a60a2fc20f9b853addfec46075dcdbdd1dd3893ae03380
+  data.tar.gz: c9a0bc998ef5413fb348f983b132d385dbdd9d1039098dbee25adc71456b34fd9ec31b45e26c93ade8f9b02672bc0be75a6d08772ccb6da1716a6b6da02d2833

data/app/lib/actions/katello/agent_action.rb

@@ -83,7 +83,12 @@ module Actions
         end
 
         unless history.finished?
-          fail _("Host did not finish content action in %s seconds.  The task has been cancelled.") % finish_timeout
+          # we could be processing the accept_timeout here
+          # only fail for finish_timeout unless the actual duration has elapsed
+          finish_limit = history.accepted_at + finish_timeout
+          if finish_limit < DateTime.now
+            fail _("Host did not finish content action in %s seconds.  The task has been cancelled.") % finish_timeout
+          end
         end
       end
 

data/app/lib/katello/agent/client_message_handler.rb

@@ -34,9 +34,17 @@ module Katello
       private
 
       def handle_dynflow_event
-        task_exists = ForemanTasks::Task.exists?(external_id: @dispatch_history.dynflow_execution_plan_id, result: 'pending')
-        unless task_exists
-          logger.warn("Couldn't find pending task with external_id=#{@dispatch_history.dynflow_execution_plan_id} dispatch_history_id=#{@dispatch_history.id}")
+        return unless accepted? || result
+
+        task = ForemanTasks::Task.find_by_external_id(@dispatch_history.dynflow_execution_plan_id)
+
+        unless task
+          logger.info("Task external_id=#{@dispatch_history.dynflow_execution_plan_id} wasn't found. Skipping dynflow event dispatch")
+          return
+        end
+
+        unless task.result == 'pending'
+          logger.info("Task is no longer pending. Skipping dynflow event dispatch. task_result=#{task.result} external_id=#{@dispatch_history.dynflow_execution_plan_id} dispatch_history_id=#{@dispatch_history.id}")
           return
         end
 

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.1.0.rc1".freeze
+  VERSION = "4.1.0.rc1.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 4.1.0.rc1
+  version: 4.1.0.rc1.1
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-12 00:00:00.000000000 Z
+date: 2021-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails