scylla_node: wait_for_compactions: move override to class ScyllaNode

Change a1624b5 added the method to class `NodeUpgrader` instead of `ScyllaNode` by mistake so it is a no-op and `test_lcs_sstable_promotion` still fails in debug mode occasionally, like https://jenkins.scylladb.com/view/master/job/scylla-master/job/dtest-debug/261/testReport/compaction_additional_test/TestLCSSSTablePromotion/Run_Dtest_Parallel_Cloud_Machines___FullDtest___full_split044___test_lcs_sstable_promotion/ ``` ccmlib.node.TimeoutError: Waiting for compactions timed out after 300 seconds with 26 pending tasks remaining. ``` Signed-off-by: Benny Halevy <[email protected]> (cherry picked from commit e052264)
scylladb · Nov 2, 2023 · cbd5b2b · cbd5b2b
1 parent a4c4d07
commit cbd5b2b
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/ccmlib/scylla_node.py b/ccmlib/scylla_node.py
@@ -1251,6 +1251,12 @@ def upgrade(self, upgrade_to_version):
     def rollback(self, upgrade_to_version):
         self.upgrader.upgrade(upgrade_version=upgrade_to_version, recover_system_tables=True)
 
+    def wait_for_compactions(self, idle_timeout = None):
+        if idle_timeout is None:
+            idle_timeout = 300 if self.scylla_mode() != 'debug' else 900
+        super(ScyllaNode, self).wait_for_compactions(idle_timeout=idle_timeout)
+
+
 class NodeUpgrader:
 
     """
@@ -1379,8 +1385,3 @@ def validate_version_after_upgrade(self):
         if self.node.node_scylla_version != expected_version:
             raise NodeUpgradeError("Node hasn't been upgraded. Expected version after upgrade: %s, Got: %s" % (
                                     expected_version, self.node.node_scylla_version))
-
-    def wait_for_compactions(self, idle_timeout=None):
-        if idle_timeout is None:
-            idle_timeout = 300 if self.scylla_mode() != 'debug' else 900
-        super(ScyllaNode, self).wait_for_compactions(idle_timeout=idle_timeout)