You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2016/05/25 03:44:52 UTC
ambari git commit: AMBARI-16733. Ambari agent cancel logic does not
use correct name to access task id (chen jian via smohanty)
Repository: ambari
Updated Branches:
refs/heads/trunk 1a381dfa2 -> d2f9cfa78
AMBARI-16733. Ambari agent cancel logic does not use correct name to access task id (chen jian via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d2f9cfa7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d2f9cfa7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d2f9cfa7
Branch: refs/heads/trunk
Commit: d2f9cfa78d465d82b3d87b3310276903fc63c1c1
Parents: 1a381df
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Tue May 24 20:42:53 2016 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Tue May 24 20:42:53 2016 -0700
----------------------------------------------------------------------
ambari-agent/src/main/python/ambari_agent/ActionQueue.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d2f9cfa7/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
index 7621939..5c9189c 100644
--- a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
+++ b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
@@ -135,13 +135,13 @@ class ActionQueue(threading.Thread):
while not queue.empty():
queued_command = queue.get(False)
- if queued_command['task_id'] != task_id:
+ if queued_command['taskId'] != task_id:
self.commandQueue.put(queued_command)
else:
logger.info("Canceling " + queued_command['commandType'] + \
" for service " + queued_command['serviceName'] + \
- " of cluster " + queued_command['clusterName'] + \
- " to the queue.")
+ " and role " + queued_command['role'] + \
+ " with taskId " + queued_command['taskId'])
# Kill if in progress
self.customServiceOrchestrator.cancel_command(task_id, reason)