From 0b7310c010b84e5eefeb42057725d1da05a4e9cd Mon Sep 17 00:00:00 2001 From: Daniel Jatnieks Date: Fri, 1 Sep 2023 10:45:40 -0700 Subject: [PATCH] Fix FailingRepairTest by making sure Gossip is started before each test patch by Daniel Jatnieks; reviewed by Brandon Williams and Stefan Miklosovic for CASSANDRA-18366 --- .../cassandra/distributed/test/FailingRepairTest.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/test/distributed/org/apache/cassandra/distributed/test/FailingRepairTest.java b/test/distributed/org/apache/cassandra/distributed/test/FailingRepairTest.java index 7feefa3012..d1a503078a 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/FailingRepairTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/FailingRepairTest.java @@ -60,6 +60,7 @@ import org.apache.cassandra.distributed.api.ICluster; import org.apache.cassandra.distributed.api.IIsolatedExecutor.SerializableRunnable; import org.apache.cassandra.distributed.api.IInvokableInstance; import org.apache.cassandra.distributed.impl.InstanceKiller; +import org.apache.cassandra.gms.Gossiper; import org.apache.cassandra.io.sstable.CorruptSSTableException; import org.apache.cassandra.io.sstable.ISSTableScanner; import org.apache.cassandra.io.sstable.format.ForwardingSSTableReader; @@ -162,7 +163,14 @@ public class FailingRepairTest extends TestBaseImpl implements Serializable public void cleanupState() { for (int i = 1; i <= CLUSTER.size(); i++) - CLUSTER.get(i).runOnInstance(InstanceKiller::clear); + CLUSTER.get(i).runOnInstance(() -> { + InstanceKiller.clear(); + if (!StorageService.instance.isGossipActive()) + { + StorageService.instance.startGossiping(); + Gossiper.waitToSettle(); + } + }); } @Test(timeout = 10 * 60 * 1000)