This is an automated email from the ASF dual-hosted git repository.
dcapwell pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
The following commit(s) were added to refs/heads/master by this push:
new 5db813c When compaction gets interrupted, the exception should
include the compactionId
5db813c is described below
commit 5db813c579696bd51f5327a92fef59588367e4d4
Author: Yifan Cai <Yifan Cai>
AuthorDate: Tue Sep 8 14:41:12 2020 -0700
When compaction gets interrupted, the exception should include the
compactionId
patch by Yifan Cai; reviewed by David Capwell, Caleb Rackliffe for
CASSANDRA-15954
---
jmx_test.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/jmx_test.py b/jmx_test.py
index f99fed0..760b801 100644
--- a/jmx_test.py
+++ b/jmx_test.py
@@ -8,6 +8,8 @@ import logging
import ccmlib.common
from ccmlib.node import ToolError
+from distutils.version import LooseVersion
+
from dtest import Tester
from tools.jmxutils import (JolokiaAgent, enable_jmx_ssl, make_mbean,
remove_perf_disable_shared_mem)
@@ -213,6 +215,8 @@ class TestJMX(Tester):
updated_progress_string = jmx.read_attribute(compaction_manager,
'CompactionSummary')[0]
var = 'Compaction@{uuid}(keyspace1, standard1,
{progress}/{total})bytes'
+ if self.cluster.version() >= LooseVersion('4.0'): # CASSANDRA-15954
+ var = 'Compaction({taskUuid}, {progress} / {total}
bytes)@{uuid}(keyspace1, standard1)'
progress = int(parse.search(var,
progress_string).named['progress'])
updated_progress = int(parse.search(var,
updated_progress_string).named['progress'])
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
