This is an automated email from the ASF dual-hosted git repository.
bdeggleston pushed a change to branch cep-45-mutation-tracking
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from a8f2ce44a3 Add support for counters to mutation tracking
new 9d1ccb9901 ninja: use configured flush mode
new 3d8f81c4e2 ninja: skip tests using unsupported operations
The 2 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:
.../apache/cassandra/replication/MutationJournal.java | 16 ++++++++++++++--
.../distributed/test/TransientRangeMovement2Test.java | 3 +++
.../distributed/test/TransientRangeMovementTest.java | 3 +++
.../distributed/test/tracking/MutationTrackingUtils.java | 7 +++++++
4 files changed, 27 insertions(+), 2 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
This is an automated email from the ASF dual-hosted git repository.
bdeggleston pushed a commit to branch cep-45-mutation-tracking
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 3d8f81c4e2a6d8dfd22cbca55aac026ddcc24a36
Author: Blake Eggleston <bl...@ultrablake.com>
AuthorDate: Thu Jan 29 10:12:20 2026 -0800
ninja: skip tests using unsupported operations
---
.../cassandra/distributed/test/TransientRangeMovement2Test.java | 3 +++
.../cassandra/distributed/test/TransientRangeMovementTest.java | 3 +++
.../cassandra/distributed/test/tracking/MutationTrackingUtils.java | 7 +++++++
3 files changed, 13 insertions(+)
diff --git a/test/distributed/org/apache/cassandra/distributed/test/TransientRangeMovement2Test.java b/test/distributed/org/apache/cassandra/distributed/test/TransientRangeMovement2Test.java
index c52b8920c4..29926b36fe 100644
--- a/test/distributed/org/apache/cassandra/distributed/test/TransientRangeMovement2Test.java
+++ b/test/distributed/org/apache/cassandra/distributed/test/TransientRangeMovement2Test.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
+import org.junit.Ignore;
import org.junit.Test;
import org.apache.cassandra.distributed.Cluster;
@@ -29,6 +30,7 @@ import org.apache.cassandra.distributed.api.Feature;
import org.apache.cassandra.distributed.api.IInstanceConfig;
import org.apache.cassandra.distributed.api.IInvokableInstance;
import org.apache.cassandra.distributed.shared.NetworkTopology;
+import org.apache.cassandra.distributed.test.tracking.MutationTrackingUtils;
import org.apache.cassandra.tcm.Epoch;
import org.apache.cassandra.tcm.transformations.PrepareMove;
import org.apache.cassandra.utils.Pair;
@@ -44,6 +46,7 @@ import static org.apache.cassandra.distributed.test.TransientRangeMovementTest.a
import static org.apache.cassandra.distributed.test.TransientRangeMovementTest.localStrs;
import static org.apache.cassandra.distributed.test.TransientRangeMovementTest.populate;
+@Ignore(MutationTrackingUtils.IgnoreReasons.NO_RANGE_MOVEMENTS)
@SuppressWarnings("unchecked")
public class TransientRangeMovement2Test extends TestBaseImpl
{
diff --git a/test/distributed/org/apache/cassandra/distributed/test/TransientRangeMovementTest.java b/test/distributed/org/apache/cassandra/distributed/test/TransientRangeMovementTest.java
index 7f1759ae98..4c0cfe0147 100644
--- a/test/distributed/org/apache/cassandra/distributed/test/TransientRangeMovementTest.java
+++ b/test/distributed/org/apache/cassandra/distributed/test/TransientRangeMovementTest.java
@@ -30,6 +30,7 @@ import java.util.concurrent.ExecutionException;
import java.util.function.Function;
import com.google.common.collect.Sets;
+import org.junit.Ignore;
import org.junit.Test;
import org.apache.cassandra.distributed.Cluster;
@@ -39,6 +40,7 @@ import org.apache.cassandra.distributed.api.IInstanceConfig;
import org.apache.cassandra.distributed.api.IInvokableInstance;
import org.apache.cassandra.distributed.api.TokenSupplier;
import org.apache.cassandra.distributed.shared.NetworkTopology;
+import org.apache.cassandra.distributed.test.tracking.MutationTrackingUtils;
import org.apache.cassandra.tcm.ClusterMetadata;
import org.apache.cassandra.tcm.Epoch;
import org.apache.cassandra.tcm.transformations.PrepareLeave;
@@ -58,6 +60,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+@Ignore(MutationTrackingUtils.IgnoreReasons.NO_RANGE_MOVEMENTS)
@SuppressWarnings("unchecked")
public class TransientRangeMovementTest extends TestBaseImpl
{
diff --git a/test/distributed/org/apache/cassandra/distributed/test/tracking/MutationTrackingUtils.java b/test/distributed/org/apache/cassandra/distributed/test/tracking/MutationTrackingUtils.java
index e1168dcf17..48fc9c259f 100644
--- a/test/distributed/org/apache/cassandra/distributed/test/tracking/MutationTrackingUtils.java
+++ b/test/distributed/org/apache/cassandra/distributed/test/tracking/MutationTrackingUtils.java
@@ -56,6 +56,13 @@ public class MutationTrackingUtils
private static final Logger logger = LoggerFactory.getLogger(MutationTrackingUtils.class);
private static final int VERSION = MessagingService.current_version;
+ public static class IgnoreReasons
+ {
+ public static final String NO_RANGE_MOVEMENTS = "NO_RANGE_MOVEMENTS";
+
+
+ }
+
public static byte[] encodeId(MutationId id)
{
int size = Ints.checkedCast(MutationId.serializer.serializedSize(id, VERSION));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
This is an automated email from the ASF dual-hosted git repository.
bdeggleston pushed a commit to branch cep-45-mutation-tracking
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 9d1ccb990157a3db4b435b036d65a0b40c111f85
Author: Blake Eggleston <bl...@ultrablake.com>
AuthorDate: Wed Jan 28 16:07:24 2026 -0800
ninja: use configured flush mode
---
.../apache/cassandra/replication/MutationJournal.java | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/java/org/apache/cassandra/replication/MutationJournal.java b/src/java/org/apache/cassandra/replication/MutationJournal.java
index 6568452699..1112e5d05b 100644
--- a/src/java/org/apache/cassandra/replication/MutationJournal.java
+++ b/src/java/org/apache/cassandra/replication/MutationJournal.java
@@ -30,6 +30,8 @@ import javax.annotation.Nullable;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
+import org.apache.cassandra.config.Config;
+import org.jctools.maps.NonBlockingHashMapLong;
import accord.utils.Invariants;
import org.agrona.collections.Long2LongHashMap;
@@ -52,7 +54,6 @@ import org.apache.cassandra.schema.Schema;
import org.apache.cassandra.schema.TableId;
import org.apache.cassandra.utils.Crc;
import org.apache.cassandra.utils.concurrent.Semaphore;
-import org.jctools.maps.NonBlockingHashMapLong;
import static org.apache.cassandra.utils.FBUtilities.getAvailableProcessors;
@@ -353,7 +354,18 @@ public class MutationJournal
@Override
public FlushMode flushMode()
{
- return FlushMode.PERIODIC;
+ Config.CommitLogSync mode = DatabaseDescriptor.getCommitLogSync();
+ switch (DatabaseDescriptor.getCommitLogSync())
+ {
+ case batch:
+ return FlushMode.BATCH;
+ case periodic:
+ return FlushMode.PERIODIC;
+ case group:
+ return FlushMode.GROUP;
+ default:
+ throw new IllegalStateException("Unhandled flush mode: " + mode);
+ }
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org