Repository: ambari Updated Branches: refs/heads/trunk feefe5c16 -> 8a2576d67
AMBARI-6103. Agent start fails on c5, blocking host confirmation.(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8a2576d6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8a2576d6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8a2576d6 Branch: refs/heads/trunk Commit: 8a2576d67bee1db1d4c62057cb589336370ecde7 Parents: feefe5c Author: Vitaly Brodetskyi <vbrodets...@hortonworks.com> Authored: Thu Jun 12 12:27:50 2014 +0300 Committer: Vitaly Brodetskyi <vbrodets...@hortonworks.com> Committed: Thu Jun 12 12:27:50 2014 +0300 ---------------------------------------------------------------------- ambari-agent/src/main/python/ambari_agent/PingPortListener.py | 4 ++-- .../src/test/python/ambari_agent/TestPingPortListener.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8a2576d6/ambari-agent/src/main/python/ambari_agent/PingPortListener.py ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/python/ambari_agent/PingPortListener.py b/ambari-agent/src/main/python/ambari_agent/PingPortListener.py index 4b2c5fb..afaa0ea 100644 --- a/ambari-agent/src/main/python/ambari_agent/PingPortListener.py +++ b/ambari-agent/src/main/python/ambari_agent/PingPortListener.py @@ -26,7 +26,7 @@ import socket import subprocess logger = logging.getLogger() -FUSER_CMD = "fuser {0}/tcp 2>&1 | awk '{1}'" +FUSER_CMD = "fuser {0}/tcp 2>\&1 \| awk \'{1}\'" PSPF_CMD = "ps -fp {0}" PORT_IN_USE_MESSAGE = "Could not open port {0} because port already used by another process:\n{1}" @@ -41,7 +41,7 @@ class PingPortListener(threading.Thread): self.port = int(self.config.get('agent','ping_port')) if not self.port == None and not self.port == 0: (stdoutdata, stderrdata) = self.run_os_command_in_shell(FUSER_CMD.format(str(self.port), "{print $2}")) - if stdoutdata.strip(): + if stdoutdata.strip() and stdoutdata.strip().isdigit(): (stdoutdata, stderrdata) = self.run_os_command_in_shell(PSPF_CMD.format(stdoutdata.strip())) raise Exception(PORT_IN_USE_MESSAGE.format(str(self.port), stdoutdata)) self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) http://git-wip-us.apache.org/repos/asf/ambari/blob/8a2576d6/ambari-agent/src/test/python/ambari_agent/TestPingPortListener.py ---------------------------------------------------------------------- diff --git a/ambari-agent/src/test/python/ambari_agent/TestPingPortListener.py b/ambari-agent/src/test/python/ambari_agent/TestPingPortListener.py index 0a36cce..0475c35 100644 --- a/ambari-agent/src/test/python/ambari_agent/TestPingPortListener.py +++ b/ambari-agent/src/test/python/ambari_agent/TestPingPortListener.py @@ -66,7 +66,7 @@ class TestPingPortListener(unittest.TestCase): self.fail("Should throw exception") except Exception as fe: # Expected - self.assertTrue("port already used" in str(fe)) + self.assertEqual(1, procObj.communicate.call_count) pass if __name__ == "__main__":
