[fluo-muchos] branch master updated: allow using accumulo snapshot with java11 (#297)

[kt...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kturner pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/fluo-muchos.git


View the commit online:
https://github.com/apache/fluo-muchos/commit/efa8972b28ff08037e8561ad7b9d658d67ead9dc

The following commit(s) were added to refs/heads/master by this push:
     new efa8972  allow using accumulo snapshot with java11 (#297)
efa8972 is described below

commit efa8972b28ff08037e8561ad7b9d658d67ead9dc
Author: Keith Turner <kt...@apache.org>
AuthorDate: Wed Nov 20 17:12:26 2019 -0500

    allow using accumulo snapshot with java11 (#297)
    
    Saw the following error when attempting to use snapshot version of
    Accumulo and Java 11.  This commit fixes there error.
    
    ```
    $ ./bin/muchos launch -c kt1
    Traceback (most recent call last):
      File "/home/user1/muchos/lib/main.py", line 83, in <module>
        main()
      File "/home/user1/muchos/lib/main.py", line 55, in main
        config.verify_config(action)
      File "/home/user1/muchos/lib/muchos/config/ec2.py", line 40, in
    verify_config
        self._verify_config(action)
      File "/home/user1/muchos/lib/muchos/config/base.py", line 174, in
    _verify_config
        if self.java_product_version() >= 11 and
    StrictVersion(self.version('accumulo')) <= StrictVersion("1.9.3"):
      File "/usr/lib/python3.5/distutils/version.py", line 40, in __init__
        self.parse(vstring)
      File "/usr/lib/python3.5/distutils/version.py", line 137, in parse
        raise ValueError("invalid version number '%s'" % vstring)
    ValueError: invalid version number '2.1.0-SNAPSHOT'
    ```
---
 lib/muchos/config/base.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/muchos/config/base.py b/lib/muchos/config/base.py
index 9c6696a..0f01aff 100644
--- a/lib/muchos/config/base.py
+++ b/lib/muchos/config/base.py
@@ -171,7 +171,7 @@ class BaseConfig(ConfigParser, metaclass=ABCMeta):
 
             # validate if we are using Java 11 and fail if we are using Accumulo 1.x
             # See https://github.com/apache/accumulo/issues/958 for details
-            if self.java_product_version() >= 11 and StrictVersion(self.version('accumulo')) <= StrictVersion("1.9.3"):
+            if self.java_product_version() >= 11 and StrictVersion(self.version('accumulo').replace('-SNAPSHOT','')) <= StrictVersion("1.9.3"):
                 exit("ERROR - Java 11 is not supported with Accumulo version '{0}'".format(self.version('accumulo')))
 
     @abstractmethod
@@ -426,4 +426,4 @@ class BaseConfig(ConfigParser, metaclass=ABCMeta):
             *_, val = filter(None, all_values)
         except ValueError:
             return default
-        return val
\ No newline at end of file
+        return val