[ambari] 02/02: AMBARI-24097. Canceling task during blueprint install results in agent not responding to any other tasks (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

commit 484cd10cf4066926cd8715821d9f5eb29e1c273b
Author: Andrew Onishuk <ao...@hortonworks.com>
AuthorDate: Thu Jun 14 12:37:12 2018 +0300

    AMBARI-24097. Canceling task during blueprint install results in agent not responding to any other tasks (aonishuk)
---
 ambari-agent/src/main/python/ambari_agent/ActionQueue.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
index 6ee3ec0..c30e404 100644
--- a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
+++ b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
@@ -329,12 +329,15 @@ class ActionQueue(threading.Thread):
 
         command['agentLevelParams']['commandBeingRetried'] = "true"
         self.cancelEvent.wait(delay) # wake up if something was canceled
+
         continue
       else:
         logger.info("Quit retrying for command with taskId = {cid}. Status: {status}, retryAble: {retryAble}, retryDuration (sec): {retryDuration}, last delay (sec): {delay}"
                     .format(cid=taskId, status=status, retryAble=retryAble, retryDuration=retryDuration, delay=delay))
         break
 
+    self.cancelEvent.clear()
+
     # do not fail task which was rescheduled from server
     if command_canceled:
       with self.lock:

-- 
To stop receiving notification emails like this one, please contact
aonishuk@apache.org.