From be942e9a4fbb6164fa668c187e3cb996894bb790 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20J=C4=99drzejczak?= Date: Wed, 18 Mar 2026 16:46:04 +0100 Subject: [PATCH] test: test_remove_garbage_group0_members: wait for token ring and group0 consistency before removenode The removenove initiator could have an outdated token ring (still considering the node removed by the previous removenode a token owner) and unexpectedly reject the operation. Fix that by waiting for token ring and group0 consistency before removenode. Note that the test already checks that consistency, but only for one node, which is different from the removenode initiator. This test has been removed in master together with the code being tested (the gossip-based topology). Hence, the fix is submitted directly to 2026.1. Fixes https://scylladb.atlassian.net/browse/SCYLLADB-1103 Backport to all supported branches (other than 2026.1), as the test can fail there. Closes scylladb/scylladb#29108 (cherry picked from commit 1398a55d1642f2658914a9439e924e5550accb31) Closes scylladb/scylladb#29205 --- test/cluster/test_topology_remove_garbage_group0.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/cluster/test_topology_remove_garbage_group0.py b/test/cluster/test_topology_remove_garbage_group0.py index 0c439f9368..08953adb35 100644 --- a/test/cluster/test_topology_remove_garbage_group0.py +++ b/test/cluster/test_topology_remove_garbage_group0.py @@ -94,6 +94,8 @@ async def test_remove_garbage_group0_members(manager: ManagerClient): logging.info(f'stop {servers[1]}') await manager.server_stop_gracefully(servers[1].server_id) + await wait_for_token_ring_and_group0_consistency(manager, time.time() + 60) + logging.info(f'removenode {servers[1]} using {servers[2]}') await manager.remove_node(servers[2].server_id, servers[1].server_id)