You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2014/12/11 19:13:29 UTC
ambari git commit: AMBARI-8624. Deploy on Ubuntu12, CentOS6,
SUSE11 was hanged on install page. (Florian Barca via yusaku)
Repository: ambari
Updated Branches:
refs/heads/trunk 54d01fc54 -> 8e4ce69df
AMBARI-8624. Deploy on Ubuntu12, CentOS6, SUSE11 was hanged on install page. (Florian Barca via yusaku)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8e4ce69d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8e4ce69d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8e4ce69d
Branch: refs/heads/trunk
Commit: 8e4ce69df8acb9696c197b1bdb0bda8662881b52
Parents: 54d01fc
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Thu Dec 11 10:12:52 2014 -0800
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Thu Dec 11 10:13:22 2014 -0800
----------------------------------------------------------------------
ambari-agent/src/main/python/ambari_agent/HeartbeatHandlers.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8e4ce69d/ambari-agent/src/main/python/ambari_agent/HeartbeatHandlers.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/ambari_agent/HeartbeatHandlers.py b/ambari-agent/src/main/python/ambari_agent/HeartbeatHandlers.py
index 8d4984b..f9d0e14 100644
--- a/ambari-agent/src/main/python/ambari_agent/HeartbeatHandlers.py
+++ b/ambari-agent/src/main/python/ambari_agent/HeartbeatHandlers.py
@@ -71,7 +71,7 @@ class HeartbeatStopHandlersWindows(HeartbeatStopHandlers):
raise FatalException(-1, "Error waiting for stop/heartbeat events: " + str(result))
if (win32event.WAIT_TIMEOUT == result):
return -1
- return result
+ return result # 0 -> stop, 1 -> heartbeat
# linux impl
@@ -119,13 +119,13 @@ class HeartbeatStopHandlersLinux(HeartbeatStopHandlers):
def wait(self, timeout1, timeout2=0):
if self.heartbeat_wait_event.wait(timeout=timeout1):
# Event signaled, exit
- return 0
+ return 1
# Stop loop when stop event received
# Otherwise sleep a bit more to allow STATUS_COMMAND results to be collected
# and sent in one heartbeat. Also avoid server overload with heartbeats
if self.stop_event.wait(timeout=timeout2):
logger.info("Stop event received")
- return 1
+ return 0
# Timeout
return -1