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 781b4bf AMBARI-24201. Command reschedule does not work causing
blueprint deployments to timeout (aonishuk)
781b4bf is described below
commit 781b4bfe9879ce56837b913a7ad6db46908bb684
Author: Andrew Onishuk <[email protected]>
AuthorDate: Wed Jun 27 15:17:29 2018 +0300
AMBARI-24201. Command reschedule does not work causing blueprint
deployments to timeout (aonishuk)
---
ambari-agent/src/main/python/ambari_agent/ActionQueue.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
index 87291fd..e1830f4 100644
--- a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
+++ b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
@@ -278,7 +278,9 @@ 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()
+ self.taskIdsToCancel.discard(taskId) # for case of command reschedule
(e.g. command and cancel for the same taskId are send at the same time)
while retryDuration >= 0:
if taskId in self.taskIdsToCancel:
