This is an automated email from the ASF dual-hosted git repository.
knarendran 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 cff01c5 Allow testing ZK snapshot (#354)
cff01c5 is described below
commit cff01c59fc816b43dc237abb3e44a8f7b8eb8c8f
Author: Karthick Narendran <[email protected]>
AuthorDate: Mon Jun 15 19:08:29 2020 +0100
Allow testing ZK snapshot (#354)
Co-authored-by: Karthick Narendran <[email protected]>
---
lib/muchos/config/base.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/lib/muchos/config/base.py b/lib/muchos/config/base.py
index 6b24a25..7780d87 100644
--- a/lib/muchos/config/base.py
+++ b/lib/muchos/config/base.py
@@ -112,7 +112,8 @@ _HOST_VAR_DEFAULTS = {
),
"zookeeper_client_port": "2181",
"zookeeper_basename": (
- "{% if zookeeper_version is version('3.5', '>=') %}"
+ "{% if zookeeper_version is version('3.5', '>=') or "
+ "zookeeper_version in 'SNAPSHOT' %}"
"apache-zookeeper-{{ zookeeper_version }}-bin{% else %}"
"zookeeper-{{ zookeeper_version }}{% endif %}"
),
@@ -270,9 +271,9 @@ class BaseConfig(ConfigParser, metaclass=ABCMeta):
)
# fail if we are using ZooKeeper >= 3.5.5 with Accumulo <= 1.9.x
- if StrictVersion(self.version("zookeeper")) >= StrictVersion(
- "3.5.5"
- ) and StrictVersion(
+ if StrictVersion(
+ self.version("zookeeper").replace("-SNAPSHOT", "")
+ ) >= StrictVersion("3.5.5") and StrictVersion(
self.version("accumulo").replace("-SNAPSHOT", "")
) < StrictVersion(
"1.10.0"
