zuul/nodepool
Code Issues Proposed changes

Merge "Change nodepoold ZK config change logic"

Browse Source
This commit is contained in:
Jenkins 2016-12-19 18:42:44 +00:00 committed by Gerrit Code Review
commit 54bd6b86f1
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nodepool/nodepool.py
View File

@ -1041,18 +1041,15 @@ class NodePool(threading.Thread):
configured = config.zookeeper_servers.values()
if running == configured:
self.log.debug("Zookeeper client does not need to be updated")
if self.config:
config.zookeeper_servers = self.config.zookeeper_servers
return
if not self.zk:
if not self.zk and configured:
self.log.debug("Connecting to ZooKeeper servers")
self.zk = zk.ZooKeeper()
self.zk.connect(configured)
else:
self.log.debug("Detected ZooKeeper server changes")
self.zk.disconnect()
if configured:
self.zk.connect(config.zookeeper_servers.values())
self.zk.resetHosts(configured)
def setConfig(self, config):
self.config = config