[ambari] branch trunk updated: AMBARI-24174. Agent failed to process execution command (aonishuk)

[ao...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

aonishuk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new f439ce8  AMBARI-24174. Agent failed to process execution command (aonishuk)
f439ce8 is described below

commit f439ce837b18966e29f200c646af1ca48875dabe
Author: Andrew Onishuk <ao...@hortonworks.com>
AuthorDate: Sat Jun 23 12:20:14 2018 +0300

    AMBARI-24174. Agent failed to process execution command (aonishuk)
---
 ambari-agent/src/main/python/ambari_agent/ActionQueue.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
index c30e404..87291fd 100644
--- a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
+++ b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
@@ -278,6 +278,8 @@ class ActionQueue(threading.Thread):
     logger.info("Command execution metadata - taskId = {taskId}, retry enabled = {retryAble}, max retry duration (sec) = {retryDuration}, log_output = {log_command_output}".
                  format(taskId=taskId, retryAble=retryAble, retryDuration=retryDuration, log_command_output=log_command_output))
     command_canceled = False
+    self.cancelEvent.clear()
+
     while retryDuration >= 0:
       if taskId in self.taskIdsToCancel:
         logger.info('Command with taskId = {0} canceled'.format(taskId))
@@ -336,7 +338,7 @@ class ActionQueue(threading.Thread):
                     .format(cid=taskId, status=status, retryAble=retryAble, retryDuration=retryDuration, delay=delay))
         break
 
-    self.cancelEvent.clear()
+    self.taskIdsToCancel.discard(taskId)
 
     # do not fail task which was rescheduled from server
     if command_canceled: