Author: ncole
Date: Thu May 23 18:55:13 2013
New Revision: 1485826
URL: http://svn.apache.org/r1485826
Log:
AMBARI-2192. Fix for agent hanging during install
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/HostInfo.py
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1485826&r1=1485825&r2=1485826&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu May 23 18:55:13 2013
@@ -1678,6 +1678,8 @@ Trunk (unreleased changes):
AMBARI-1657. User directories on HDFS do not get created with custom names
provided from Ambari UI. (swagle)
+ AMBARI-2192. Fix for agent hanging during install. (ncole)
+
AMBARI-2125. Fix for UNKNOWN state failing retry on install. (ncole)
AMBARI-2072. Fix to remove actual_configs from cluster response. (ncole)
Modified:
incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/HostInfo.py
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/HostInfo.py?rev=1485826&r1=1485825&r2=1485826&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/HostInfo.py
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/python/ambari_agent/HostInfo.py
Thu May 23 18:55:13 2013
@@ -88,22 +88,7 @@ class HostInfo:
etcList.append(confinfo)
def repos(self):
- # centos, redhat
- try:
- osStat = subprocess.Popen(["yum", "-C", "repolist"],
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- out, err = osStat.communicate()
- return out
- except:
- pass
- # suse, only if above failed
- try:
- osStat = subprocess.Popen(["zypper", "repos"], stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
- out, err = osStat.communicate()
- return out
- except:
- pass
-
- # default, never return empty
+ # future
return "could_not_determine"
