浏览代码

[libsentry] Pick up the correct ZooKeeper quorum when HA

Romain Rigaux 10 年之前
父节点
当前提交
f5ad689
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      desktop/libs/libsentry/src/libsentry/api.py
  2. 1 1
      desktop/libs/libsentry/src/libsentry/sentry_site.py

+ 1 - 1
desktop/libs/libsentry/src/libsentry/api.py

@@ -261,7 +261,7 @@ def _get_server_properties():
             from zookeeper.conf import CLUSTERS
             sasl_server_principal = CLUSTERS.get()['default'].PRINCIPAL_NAME.get()
           except Exception, e:
-            LOG.error("Could not get principal name from ZooKeeper app config: %s. Using 'zookeeper' as principal name." % e)
+            LOG.warn("Could not get principal name from ZooKeeper app config: %s. Using 'zookeeper' as principal name." % e)
             sasl_server_principal = 'zookeeper'
         else:
           sasl_server_principal = None

+ 1 - 1
desktop/libs/libsentry/src/libsentry/sentry_site.py

@@ -38,7 +38,7 @@ _CONF_SENTRY_SERVER_ADMIN_GROUP = 'sentry.service.admin.group'
 
 _CONF_SENTRY_SERVER_HA_ENABLED = 'sentry.ha.enabled'
 _CONF_SENTRY_SERVER_HA_HAS_SECURITY = 'sentry.ha.zookeeper.security'
-_CONF_SENTRY_SERVER_HA_ZOOKEEPER_ADDRESSES = 'sentry.ha.zookeeper.security.quorum'
+_CONF_SENTRY_SERVER_HA_ZOOKEEPER_ADDRESSES = 'sentry.ha.zookeeper.quorum'
 _CONF_SENTRY_SERVER_HA_ZOOKEEPER_NAMESPACE = 'sentry.ha.zookeeper.namespace'