From 348a128c35396164b69598bf075054cf11f855d0 Mon Sep 17 00:00:00 2001 From: Alexey Biryukov Date: Thu, 5 Jan 2023 13:51:17 -0500 Subject: [PATCH 1/2] tests: call clean_node() to cleanup after rouge rp instances (cherry picked from commit ee680b4a7ab165c76b03d6975fa4d87e22dac860) --- tests/rptest/tests/nodes_decommissioning_test.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/rptest/tests/nodes_decommissioning_test.py b/tests/rptest/tests/nodes_decommissioning_test.py index 82f8c35f74cd..bf12faca3bf8 100644 --- a/tests/rptest/tests/nodes_decommissioning_test.py +++ b/tests/rptest/tests/nodes_decommissioning_test.py @@ -545,6 +545,8 @@ def test_decommissioning_rebalancing_node(self, shutdown_decommissioned): self.await_startup(min_records=self.records_to_wait(), timeout_sec=120) # throttle recovery rpk = RpkTool(self.redpanda) + self.redpanda.clean_node(self.redpanda.nodes[-1], + preserve_current_install=True) self.redpanda.start_node(self.redpanda.nodes[-1]) rpk.cluster_config_set("raft_learner_recovery_rate", str(10)) # wait for rebalancing to start From 9713a35ec88e0988eebc491aceb43d5b78506109 Mon Sep 17 00:00:00 2001 From: Alexey Biryukov Date: Mon, 10 Apr 2023 13:14:28 -0400 Subject: [PATCH 2/2] tests: Fix garbage left from the github web conflict resolve tool --- tests/rptest/tests/nodes_decommissioning_test.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/rptest/tests/nodes_decommissioning_test.py b/tests/rptest/tests/nodes_decommissioning_test.py index a01fa07927cf..fb7a24d37e58 100644 --- a/tests/rptest/tests/nodes_decommissioning_test.py +++ b/tests/rptest/tests/nodes_decommissioning_test.py @@ -755,4 +755,3 @@ def tried_to_join(): auto_assign_node_id=new_bootstrap) assert len(admin.get_brokers(node=self.redpanda.nodes[0])) == 4 -ssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss \ No newline at end of file