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 2015/05/26 07:23:38 UTC
ambari git commit: Revert "AMBARI-11382.
test_execute_retryable_command_succeed fails intermittently"
Repository: ambari
Updated Branches:
refs/heads/trunk d12a79c40 -> af7cc7480
Revert "AMBARI-11382. test_execute_retryable_command_succeed fails intermittently"
This reverts commit d12a79c4021ef5fbc574e46fb0e4fe99abf05fc0.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/af7cc748
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/af7cc748
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/af7cc748
Branch: refs/heads/trunk
Commit: af7cc7480afc02c88838c31889f4f2959a391765
Parents: d12a79c
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Mon May 25 22:23:09 2015 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Mon May 25 22:23:09 2015 -0700
----------------------------------------------------------------------
ambari-agent/src/main/python/ambari_agent/ActionQueue.py | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/af7cc748/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 afb60d4..bdf8767 100644
--- a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
+++ b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
@@ -279,10 +279,7 @@ class ActionQueue(threading.Thread):
if isCommandBackground:
return
else:
- if commandresult['exitcode'] == 0:
- status = self.COMPLETED_STATUS
- else:
- status = self.FAILED_STATUS
+ status = self.COMPLETED_STATUS if commandresult['exitcode'] == 0 else self.FAILED_STATUS
if status != self.COMPLETED_STATUS and retryAble == True and maxAttempts > numAttempts:
delay = self.get_retry_delay(delay)