From b4d8a4e74bcadfe034e37bdf66b03c7281631bfe Mon Sep 17 00:00:00 2001 From: Felix Edel Date: Mon, 15 Feb 2021 14:37:06 +0100 Subject: Simplify ZooKeeper client initialization The ZooKeeperClient now provides a fromConfig() method that parses all necessary configuration values to instantiate a ZooKeeperClient. Previously, this needed to be done in every component to initialize the connection to ZooKeeper. Change-Id: I5fa4ddab5f85c658291f1262ee0392a60086846e --- zuul/cmd/scheduler.py | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) (limited to 'zuul/cmd/scheduler.py') diff --git a/zuul/cmd/scheduler.py b/zuul/cmd/scheduler.py index 35392696c..866403f22 100755 --- a/zuul/cmd/scheduler.py +++ b/zuul/cmd/scheduler.py @@ -138,24 +138,8 @@ class Scheduler(zuul.cmd.ZuulDaemonApp): merger = zuul.merger.client.MergeClient(self.config, self.sched) nodepool = zuul.nodepool.Nodepool(self.sched) - zk_client = ZooKeeperClient() - zookeeper_hosts = get_default(self.config, 'zookeeper', 'hosts') - if not zookeeper_hosts: - raise Exception("The zookeeper hosts config value is required") - zookeeper_tls_key = get_default(self.config, 'zookeeper', 'tls_key') - zookeeper_tls_cert = get_default(self.config, 'zookeeper', 'tls_cert') - zookeeper_tls_ca = get_default(self.config, 'zookeeper', 'tls_ca') - if not (zookeeper_tls_key and zookeeper_tls_cert and zookeeper_tls_ca): - raise Exception("A TLS ZooKeeper connection is required; " - "please supply the tls_* zookeeper config values.") - zookeeper_timeout = float(get_default(self.config, 'zookeeper', - 'session_timeout', 10.0)) - zk_client.connect( - zookeeper_hosts, - timeout=zookeeper_timeout, - tls_cert=zookeeper_tls_cert, - tls_key=zookeeper_tls_key, - tls_ca=zookeeper_tls_ca) + zk_client = ZooKeeperClient.fromConfig(self.config) + zk_client.connect() self.configure_connections(require_sql=True) self.sched.setExecutor(gearman) -- cgit v1.2.1