Author: smohanty
Date: Fri Apr 19 16:25:04 2013
New Revision: 1469943
URL: http://svn.apache.org/r1469943
Log:
AMBARI-1990. After successful registration, going back to the Confirm Hosts or
re-installing agents from Install Options page causes host registration to
fail. (smohanty)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-server/src/main/python/setupAgent.py
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1469943&r1=1469942&r2=1469943&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Fri Apr 19 16:25:04 2013
@@ -774,6 +774,10 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-1990. After successful registration, going back to the Confirm Hosts
+ or re-installing agents from Install Options page causes host registration
+ to fail. (smohanty)
+
AMBARI-1991. Remove unused python files from ambari-agent. (smohanty)
AMBARI-1984. WebHCat log and pid dirs configs should be under WebHCat >
Modified: incubator/ambari/trunk/ambari-server/src/main/python/setupAgent.py
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/python/setupAgent.py?rev=1469943&r1=1469942&r2=1469943&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/main/python/setupAgent.py
(original)
+++ incubator/ambari/trunk/ambari-server/src/main/python/setupAgent.py Fri Apr
19 16:25:04 2013
@@ -81,11 +81,6 @@ def runAgent(passPhrase):
os.environ[AMBARI_PASSPHRASE_VAR] = passPhrase
subprocess.call("/usr/sbin/ambari-agent start", shell=True)
try:
- # print this to the log. despite the directory, machine.py works with
Python 2.4
- ret = execOsCommand(["python",
"/usr/lib/python2.6/site-packages/ambari_agent/machine.py"])
- if not 0 == ret['exitstatus']:
- return ret['exitstatus']
- print ret['log']
ret = execOsCommand(["tail", "-20",
"/var/log/ambari-agent/ambari-agent.log"])
if not 0 == ret['exitstatus']:
