zuul/nodepool
Code Issues Proposed changes

Merge "Only setup zNode caches in launcher"

Browse Source
This commit is contained in:
Zuul 2018-11-29 09:59:41 +00:00 committed by Gerrit Code Review
commit 40162102a7
5 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nodepool/builder.py
View File

@ -1216,7 +1216,7 @@ class NodePoolBuilder(object):
builder_id = self._getBuilderID(builder_id_file) builder_id = self._getBuilderID(builder_id_file)
# All worker threads share a single ZooKeeper instance/connection. # All worker threads share a single ZooKeeper instance/connection.
self.zk = zk.ZooKeeper() self.zk = zk.ZooKeeper(enable_cache=False)
self.zk.connect(list(self._config.zookeeper_servers.values())) self.zk.connect(list(self._config.zookeeper_servers.values()))
self.log.debug('Starting listener for build jobs') self.log.debug('Starting listener for build jobs')

2
nodepool/cmd/nodepoolcmd.py
View File

@ -373,7 +373,7 @@ class NodePoolCmd(NodepoolApp):
'image-delete', 'alien-image-list', 'image-delete', 'alien-image-list',
'list', 'delete', 'list', 'delete',
'request-list', 'info', 'erase'): 'request-list', 'info', 'erase'):
self.zk = zk.ZooKeeper() self.zk = zk.ZooKeeper(enable_cache=False)
self.zk.connect(list(config.zookeeper_servers.values())) self.zk.connect(list(config.zookeeper_servers.values()))
self.pool.setConfig(config) self.pool.setConfig(config)

2
nodepool/tests/__init__.py
View File

@ -539,7 +539,7 @@ class DBTestCase(BaseTestCase):
self.zookeeper_host, self.zookeeper_host,
self.zookeeper_port)) self.zookeeper_port))
self.zookeeper_chroot = kz_fxtr.zookeeper_chroot self.zookeeper_chroot = kz_fxtr.zookeeper_chroot
self.zk = zk.ZooKeeper() self.zk = zk.ZooKeeper(enable_cache=False)
host = zk.ZooKeeperConnectionConfig( host = zk.ZooKeeperConnectionConfig(
self.zookeeper_host, self.zookeeper_port, self.zookeeper_chroot self.zookeeper_host, self.zookeeper_port, self.zookeeper_chroot
) )

4
nodepool/zk.py
View File

@ -693,7 +693,7 @@ class ZooKeeper(object):
# Log zookeeper retry every 10 seconds # Log zookeeper retry every 10 seconds
retry_log_rate = 10 retry_log_rate = 10
def __init__(self): def __init__(self, enable_cache=True):
''' '''
Initialize the ZooKeeper object. Initialize the ZooKeeper object.
''' '''
@ -704,6 +704,7 @@ class ZooKeeper(object):
self._request_cache = None self._request_cache = None
self._cached_nodes = {} self._cached_nodes = {}
self._cached_node_requests = {} self._cached_node_requests = {}
self.enable_cache = enable_cache
# ======================================================================= # =======================================================================
# Private Methods # Private Methods
@ -894,6 +895,7 @@ class ZooKeeper(object):
except KazooTimeoutError: except KazooTimeoutError:
self.logConnectionRetryEvent() self.logConnectionRetryEvent()
if self.enable_cache:
self._node_cache = TreeCache(self.client, self.NODE_ROOT) self._node_cache = TreeCache(self.client, self.NODE_ROOT)
self._node_cache.listen_fault(self.cacheFaultListener) self._node_cache.listen_fault(self.cacheFaultListener)
self._node_cache.listen(self.nodeCacheListener) self._node_cache.listen(self.nodeCacheListener)

2
tools/print-zk.py
View File

@ -30,7 +30,7 @@ args = parser.parse_args()
config = nodepool.config.loadConfig(args.config) config = nodepool.config.loadConfig(args.config)
zk = nodepool.zk.ZooKeeper() zk = nodepool.zk.ZooKeeper(enable_cache=False)
zk.connect(config.zookeeper_servers.values()) zk.connect(config.zookeeper_servers.values())
def join(a, b): def join(a, b):