This is an automated email from the ASF dual-hosted git repository.
billie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/fluo-muchos.git
The following commit(s) were added to refs/heads/master by this push:
new 9f45db4 Add stat 4lw for zookeeper (#321)
9f45db4 is described below
commit 9f45db40c39cf8edd478c948a6cf89d27cbc6f8e
Author: billierinaldi <[email protected]>
AuthorDate: Fri Feb 7 10:34:49 2020 -0800
Add stat 4lw for zookeeper (#321)
* Add stat 4lw for zookeeper
* Change zk version comparison
---
ansible/roles/zookeeper/templates/zoo.cfg | 4 +++-
lib/muchos/config/base.py | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ansible/roles/zookeeper/templates/zoo.cfg
b/ansible/roles/zookeeper/templates/zoo.cfg
index b1e3877..af497b5 100644
--- a/ansible/roles/zookeeper/templates/zoo.cfg
+++ b/ansible/roles/zookeeper/templates/zoo.cfg
@@ -16,7 +16,9 @@ clientPort={{ zookeeper_client_port }}
# increase this if you need to handle more clients
maxClientCnxns=100
# support zk monitoring (for zk >= 3.5)
-4lw.commands.whitelist=mntr
+{% if zookeeper_version is version('3.5', '>=') %}
+4lw.commands.whitelist=mntr,stat
+{% endif %}
{% for host in groups['zookeepers'] %}
server.{{ loop.index }}={{ host }}:2888:3888
{% endfor %}
diff --git a/lib/muchos/config/base.py b/lib/muchos/config/base.py
index af7da89..d487a7f 100644
--- a/lib/muchos/config/base.py
+++ b/lib/muchos/config/base.py
@@ -73,7 +73,7 @@ _HOST_VAR_DEFAULTS = {
'worker_data_dirs': None,
'zookeeper_connect': "{% for host in groups['zookeepers'] %}{{ host
}}:2181{% if not loop.last %},{% endif %}{% endfor %}",
'zookeeper_client_port': '"2181"',
- 'zookeeper_basename': "{% if zookeeper_version.startswith('3.5')
%}apache-zookeeper-{{ zookeeper_version }}-bin{% else %}zookeeper-{{
zookeeper_version }}{% endif %}",
+ 'zookeeper_basename': "{% if zookeeper_version is version('3.5', '>=')
%}apache-zookeeper-{{ zookeeper_version }}-bin{% else %}zookeeper-{{
zookeeper_version }}{% endif %}",
'zookeeper_home': "{{ install_dir }}/{{ zookeeper_basename }}",
'zookeeper_tarball': "{{ zookeeper_basename }}.tar.gz",
'zookeeper_version': None
