diff --git a/tests/rptest/tests/partition_balancer_test.py b/tests/rptest/tests/partition_balancer_test.py index 9d4f6dd258508..d8adb2229a0d8 100644 --- a/tests/rptest/tests/partition_balancer_test.py +++ b/tests/rptest/tests/partition_balancer_test.py @@ -747,14 +747,12 @@ def is_ready_and_stable(s): @matrix(kill_same_node=[True, False]) def test_maintenance_mode(self, kill_same_node): """ - Test interaction with maintenance mode: the balancer should not schedule - any movements as long as there is a node in maintenance mode. + Test interaction with maintenance mode: the mode should not interfere + with partition balancer. Test scenario is as follows: * enable maintenance mode on some node * kill a node (the same or some other) - * check that we don't move any partitions and node switched to maintenance - mode smoothly - * turn maintenance mode off, check that partition balancing resumes + * check that balancing works """ self.start_redpanda(num_nodes=5) @@ -798,7 +796,6 @@ def entered_maintenance_mode(node): ]) ns.make_unavailable(to_kill) - self.wait_until_status(lambda s: s["status"] == "stalled") if kill_same_node: ns.make_available() @@ -807,11 +804,6 @@ def entered_maintenance_mode(node): timeout_sec=120, backoff_sec=10) - # return back to normal. - # rpk will make 3 admin requests with 10 second timeout, so with 1 problematic node, - # worst case it will hang for 30 seconds, which also happens to be the default RpkTool - # timeout. Therefore we need a larger timeout than that. - rpk.cluster_maintenance_disable(node, timeout=35) # use raw admin interface to avoid waiting for the killed node admin.patch_cluster_config( {"raft_learner_recovery_rate": 100_000_000})