fixes for AM restart
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/8737cf19 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/8737cf19 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/8737cf19 Branch: refs/heads/feature/SLIDER-151_REST_API Commit: 8737cf1988e6df98175037cb5c21c7bbccc52c9c Parents: 73f0dc3 Author: Jon Maron <jma...@hortonworks.com> Authored: Wed Aug 20 09:56:55 2014 -0400 Committer: Jon Maron <jma...@hortonworks.com> Committed: Wed Aug 20 09:56:55 2014 -0400 ---------------------------------------------------------------------- slider-agent/src/main/python/agent/Controller.py | 2 +- slider-agent/src/main/python/agent/Registry.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8737cf19/slider-agent/src/main/python/agent/Controller.py ---------------------------------------------------------------------- diff --git a/slider-agent/src/main/python/agent/Controller.py b/slider-agent/src/main/python/agent/Controller.py index 1e27efa..dfd0a09 100644 --- a/slider-agent/src/main/python/agent/Controller.py +++ b/slider-agent/src/main/python/agent/Controller.py @@ -330,7 +330,7 @@ class Controller(threading.Thread): zk_quorum = self.config.get(AgentConfig.SERVER_SECTION, Constants.ZK_QUORUM) zk_reg_path = self.config.get(AgentConfig.SERVER_SECTION, Constants.ZK_REG_PATH) registry = Registry(zk_quorum, zk_reg_path) - amHost, amSecuredPort = registry.readAMHostPort() + amHost, amUnsecuredPort, amSecuredPort = registry.readAMHostPort() logger.info("Read from ZK registry: AM host = %s, AM secured port = %s" % (amHost, amSecuredPort)) self.hostname = amHost self.secured_port = amSecuredPort http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8737cf19/slider-agent/src/main/python/agent/Registry.py ---------------------------------------------------------------------- diff --git a/slider-agent/src/main/python/agent/Registry.py b/slider-agent/src/main/python/agent/Registry.py index d9d2baf..c7d6e5d 100644 --- a/slider-agent/src/main/python/agent/Registry.py +++ b/slider-agent/src/main/python/agent/Registry.py @@ -32,6 +32,7 @@ class Registry: def readAMHostPort(self): amHost = "" amSecuredPort = "" + amUnsecuredPort = "" zk = None try: zk = KazooClient(hosts=self.zk_quorum, read_only=True) @@ -48,7 +49,7 @@ class Registry: # the port needs to be utf-8 encoded amSecuredPort = amSecuredPort.encode('utf8', 'ignore') - amUnecuredPort = amUnsecuredPort.encode('utf8', 'ignore') + amUnsecuredPort = amUnsecuredPort.encode('utf8', 'ignore') except Exception: # log and let empty strings be returned logger.error("Could not connect to zk registry at %s in quorum %s" % @@ -59,4 +60,4 @@ class Registry: zk.stop() zk.close() logger.info("AM Host = %s, AM Secured Port = %s" % (amHost, amSecuredPort)) - return amHost, amUnecuredPort, amSecuredPort + return amHost, amUnsecuredPort, amSecuredPort
