This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
The following commit(s) were added to refs/heads/trunk by this push:
new b1a075a7 Remove wait_for_compaction in offline_tools_test.py to use
method on node in ccm
b1a075a7 is described below
commit b1a075a727e6bc0eaa49b80a191a08c660cfafdc
Author: Stefan Miklosovic <smikloso...@apache.org>
AuthorDate: Wed Jun 21 16:40:37 2023 +0200
Remove wait_for_compaction in offline_tools_test.py to use method on node
in ccm
patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-18305
---
offline_tools_test.py | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/offline_tools_test.py b/offline_tools_test.py
index 51e28aab..26e0bf17 100644
--- a/offline_tools_test.py
+++ b/offline_tools_test.py
@@ -78,7 +78,7 @@ class TestOfflineTools(Tester):
node1.stress(['write', 'n=50K', 'no-warmup', '-schema',
'replication(factor=1)',
'-rate', 'threads=8'])
cluster.flush()
- self.wait_for_compactions(node1)
+ node1.wait_for_compactions()
cluster.stop()
initial_levels =
self.get_levels(node1.run_sstablemetadata(keyspace="keyspace1",
column_families=["standard1"]))
@@ -103,13 +103,6 @@ class TestOfflineTools(Tester):
(out, err, rc) = data
return list(map(int, re.findall("SSTable Level: ([0-9])", out)))
- def wait_for_compactions(self, node):
- pattern = re.compile("pending tasks: 0")
- while True:
- output, err, _ = node.nodetool("compactionstats")
- if pattern.search(output):
- break
-
def test_sstableofflinerelevel(self):
"""
Generate sstables of varying levels.
@@ -178,7 +171,7 @@ class TestOfflineTools(Tester):
node1.flush()
logger.debug("Waiting for compactions to finish")
- self.wait_for_compactions(node1)
+ node1.wait_for_compactions()
logger.debug("Stopping node")
cluster.stop()
logger.debug("Done stopping node")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
