Merge pull request #143 from zalando/bugfix/zookeeper-support-for-ctl

Add support for ZooKeeper/Exhibitor DCS URI in patronictl ... -d

patroni/ctl.py

@@ -18,6 +18,7 @@ import dateutil
 import tzlocal
 
 from .etcd import Etcd
+from .zookeeper import ZooKeeper
 from .exceptions import PatroniCtlException
 from .postgresql import parseurl
 
@@ -46,12 +47,12 @@ def parse_dcs(dcs):
         parsed = urlparse('//' + dcs)
 
     if scheme == '':
-        default_schemes = {'2181': 'zookeeper', '8500': 'consul'}
+        default_schemes = {'2181': 'zookeeper', '8181': 'exhibitor', '8500': 'consul'}
         scheme = default_schemes.get(str(parsed.port), 'etcd')
 
     port = parsed.port
     if port is None:
-        default_ports = {'consul': 8500, 'zookeeper': 2181}
+        default_ports = {'consul': 8500, 'zookeeper': 2181, 'exhibitor': 8181}
         port = default_ports.get(str(scheme), 4001)
 
     return {'scheme': str(scheme), 'hostname': str(parsed.hostname), 'port': int(port)}
@@ -105,6 +106,12 @@ def get_dcs(config, scope):
     if scheme == 'etcd':
         return Etcd(name=scope, config={'scope': scope, 'host': '{0}:{1}'.format(hostname, port)})
 
+    if scheme == 'zookeeper':
+        return ZooKeeper(name=scope, config={'scope': scope, 'hosts': [hostname], 'port': port})
+
+    if scheme == 'exhibitor':
+        return ZooKeeper(name=scope, config={'scope': scope, 'exhibitor': {'hosts': [hostname], 'port': port}})
+
     raise PatroniCtlException('Can not find suitable configuration of distributed configuration store')
 
 

tests/test_ctl.py

@@ -12,6 +12,7 @@ from patroni.etcd import Etcd, Client
 from patroni.exceptions import PatroniCtlException
 from psycopg2 import OperationalError
 from test_etcd import etcd_read, etcd_write, requests_get, socket_getaddrinfo, MockResponse
+from test_zookeeper import MockKazooClient
 from test_ha import get_cluster_initialized_without_leader, get_cluster_initialized_with_leader, \
     get_cluster_initialized_with_only_leader
 from test_postgresql import MockConnect, psycopg2_connect
@@ -173,7 +174,11 @@ other
 y''')
             assert 'Failover failed' in result.output
 
-    def test_(self):
+    @patch('patroni.zookeeper.KazooClient', MockKazooClient)
+    @patch('requests.get', requests_get)
+    def test_get_dcs(self):
+        self.assertIsNotNone(get_dcs({'dcs': {'scheme': 'zookeeper', 'hostname': 'foo', 'port': 2181}}, 'dummy'))
+        self.assertIsNotNone(get_dcs({'dcs': {'scheme': 'exhibitor', 'hostname': 'exhibitor', 'port': 8181}}, 'dummy'))
         self.assertRaises(PatroniCtlException, get_dcs, {'scheme': 'dummy'}, 'dummy')
 
     @patch('psycopg2.connect', psycopg2_connect)