This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit b575d13610173a6b88b6415ba37cc36482e606e5
Merge: 407dbacb0a ba73f7ce34
Author: Brandon Williams <[email protected]>
AuthorDate: Thu Jan 16 13:54:21 2025 -0600

    Merge branch 'cassandra-5.0' into trunk

 test/distributed/org/apache/cassandra/distributed/impl/Instance.java | 1 +
 1 file changed, 1 insertion(+)

diff --cc test/distributed/org/apache/cassandra/distributed/impl/Instance.java
index df8acbfbd7,e0eda7afce..cf4b6cdd7a
--- a/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
+++ b/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
@@@ -898,12 -853,10 +898,13 @@@ public class Instance extends IsolatedE
          Future<?> future = async((ExecutorService executor) -> {
              Throwable error = null;
  
 +            error = parallelRun(error, executor, 
SnapshotManager.instance::close);
 +
 +            CompactionManager.instance.forceShutdown();
 +
              error = parallelRun(error, executor,
                      () -> StorageService.instance.setRpcReady(false),
+                     () -> 
StorageService.instance.setIsShutdownUnsafeForTests(true),
                      
CassandraDaemon.getInstanceForTesting()::destroyClientTransports);
  
              if (config.has(GOSSIP) || config.has(NETWORK))


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to