You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2025/01/16 19:54:55 UTC
(cassandra) branch trunk updated (407dbacb0a -> b575d13610)
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 407dbacb0a Enable filtering of snapshots on keyspace, table and snapshot name in nodetool listsnapshots
new 7ffbd714b4 Set setIsShutdownUnsafeForTests(true) in dtests to fix shutdown race condition
new 18c777f641 Merge branch 'cassandra-4.0' into cassandra-4.1
new ba73f7ce34 Merge branch 'cassandra-4.1' into cassandra-5.0
new b575d13610 Merge branch 'cassandra-5.0' into trunk
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
test/distributed/org/apache/cassandra/distributed/impl/Instance.java | 1 +
1 file changed, 1 insertion(+)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
(cassandra) 01/01: Merge branch 'cassandra-5.0' into trunk
Posted by br...@apache.org.
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 <br...@apache.org>
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: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org