[19/50] cassandra git commit: Fix jolokia for mixed version clusters

[aw...@apache.org]

Fix jolokia for mixed version clusters

Patch by Jeff Jirsa; Reviewed by Aleksey Yeshchenko


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b8842b97
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b8842b97
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b8842b97

Branch: refs/heads/master
Commit: b8842b979244547dd43d48bbaeadf1cea34a9fef
Parents: 013efa1
Author: Jeff Jirsa <jj...@apple.com>
Authored: Mon Aug 14 12:55:17 2017 -0700
Committer: Jeff Jirsa <jj...@apple.com>
Committed: Mon Aug 14 12:57:47 2017 -0700

----------------------------------------------------------------------
 tools/jmxutils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8842b97/tools/jmxutils.py
----------------------------------------------------------------------
diff --git a/tools/jmxutils.py b/tools/jmxutils.py
index 1f41626..8c20eb8 100644
--- a/tools/jmxutils.py
+++ b/tools/jmxutils.py
@@ -158,7 +158,7 @@ def remove_perf_disable_shared_mem(node):
     option (see https://github.com/rhuss/jolokia/issues/198 for details).  This
     edits cassandra-env.sh (or the Windows equivalent), or jvm.options file on 3.2+ to remove that option.
     """
-    if node.cluster.version() >= LooseVersion('3.2'):
+    if node.get_cassandra_version() >= LooseVersion('3.2'):
         conf_file = os.path.join(node.get_conf_dir(), JVM_OPTIONS)
         pattern = '\-XX:\+PerfDisableSharedMem'
         replacement = '#-XX:+PerfDisableSharedMem'


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org