You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2015/05/20 18:38:45 UTC

ambari git commit: AMBARI-8768 Ambari agent Heartbeat lost when df hangs (NFS gateway), also prevents proper re-initialization of agent upon restart (additional patch) (dsen)

Repository: ambari
Updated Branches:
  refs/heads/trunk 6a3fe5472 -> 832f3b9c3


AMBARI-8768 Ambari agent Heartbeat lost when df hangs (NFS gateway), also prevents proper re-initialization of agent upon restart (additional patch) (dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/832f3b9c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/832f3b9c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/832f3b9c

Branch: refs/heads/trunk
Commit: 832f3b9c3dc64997e1a5dbccc585d9acb3e3591c
Parents: 6a3fe54
Author: Dmytro Sen <ds...@apache.org>
Authored: Wed May 20 19:38:16 2015 +0300
Committer: Dmytro Sen <ds...@apache.org>
Committed: Wed May 20 19:38:26 2015 +0300

----------------------------------------------------------------------
 ambari-agent/src/main/python/ambari_agent/Hardware.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/832f3b9c/ambari-agent/src/main/python/ambari_agent/Hardware.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/ambari_agent/Hardware.py b/ambari-agent/src/main/python/ambari_agent/Hardware.py
index 957fc60..5567286 100644
--- a/ambari-agent/src/main/python/ambari_agent/Hardware.py
+++ b/ambari-agent/src/main/python/ambari_agent/Hardware.py
@@ -72,9 +72,9 @@ class Hardware:
     command = []
     if config and \
         config.has_option(AmbariConfig.AMBARI_PROPERTIES_CATEGORY, Hardware.CHECK_REMOTE_MOUNTS_TIMEOUT_KEY) and \
-        config.get(AmbariConfig.AMBARI_PROPERTIES_CATEGORY, Hardware.CHECK_REMOTE_MOUNTS_KEY) != "0":
+        config.get(AmbariConfig.AMBARI_PROPERTIES_CATEGORY, Hardware.CHECK_REMOTE_MOUNTS_TIMEOUT_KEY) != "0":
       command.append("timeout")
-      command.append(config.get(AmbariConfig.AMBARI_PROPERTIES_CATEGORY, Hardware.CHECK_REMOTE_MOUNTS_KEY))
+      command.append(config.get(AmbariConfig.AMBARI_PROPERTIES_CATEGORY, Hardware.CHECK_REMOTE_MOUNTS_TIMEOUT_KEY))
     command.append("df")
     command.append("-kPT")
     if config and \