Skip to content

ninja-fix: Remove SSTable format randomization and related dead code for CASSANDRA-21177 #4672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shruti-p-s wants to merge 1 commit into
base: cassandra-5.0
Choose a base branch
from
+1 −26
Open

ninja-fix: Remove SSTable format randomization and related dead code for CASSANDRA-21177 #4672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,6 @@ public enum CassandraRelevantProperties
SNAPSHOT_MIN_ALLOWED_TTL_SECONDS("cassandra.snapshot.min_allowed_ttl_seconds", "60"),
SSL_ENABLE("ssl.enable"),
SSL_STORAGE_PORT("cassandra.ssl_storage_port"),
SSTABLE_FORMAT_DEFAULT("cassandra.sstable.format.default"),
Copy link
Contributor

@frankgh frankgh Mar 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this is only used from test/simulator/main/org/apache/cassandra/simulator/ClusterSimulation.java

START_GOSSIP("cassandra.start_gossip", "true"),
START_NATIVE_TRANSPORT("cassandra.start_native_transport"),
STORAGE_DIR("cassandra.storagedir"),
Expand Down
26 changes: 1 addition & 25 deletions test/simulator/main/org/apache/cassandra/simulator/ClusterSimulation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.EnumMap;
import java.util.LinkedHashMap;
import java.util.List;
Expand All @@ -43,7 +42,6 @@
import org.slf4j.LoggerFactory;

import org.apache.cassandra.concurrent.ExecutorFactory;
import org.apache.cassandra.config.CassandraRelevantProperties;
import org.apache.cassandra.config.ParameterizedClass;
import org.apache.cassandra.distributed.Cluster;
import org.apache.cassandra.distributed.api.Feature;
Expand Down Expand Up @@ -197,7 +195,6 @@ public static abstract class Builder<S extends Simulation>
protected LongConsumer onThreadLocalRandomCheck;
protected String memtableType = null;
protected String memtableAllocationType = null;
protected String sstableFormat = null;

public Debug debug()
{
Expand Down Expand Up @@ -538,12 +535,6 @@ public Builder<S> memtableAllocationType(String type)
return this;
}

public Builder<S> sstableFormat(String format)
{
this.sstableFormat = format;
return this;
}

public abstract ClusterSimulation<S> create(long seed) throws IOException;
}

Expand Down Expand Up @@ -726,20 +717,6 @@ public ClusterSimulation(RandomSource random, long seed, int uniqueNum,
}
randomizedConfig.put("memtable_allocation_type", memtableAllocationType);

// Randomize SSTable format
String sstableFormat;
if (builder.sstableFormat != null)
{
sstableFormat = builder.sstableFormat;
}
else
{
String[] formats = {"big", "bti"};
sstableFormat = formats[random.uniform(0, formats.length)];
}
randomizedConfig.put("sstable_format", sstableFormat);
CassandraRelevantProperties.SSTABLE_FORMAT_DEFAULT.setString(sstableFormat);

KindOfSequence kindOfDriftSequence = Choices.uniform(KindOfSequence.values()).choose(random);
KindOfSequence kindOfDiscontinuitySequence = Choices.uniform(KindOfSequence.values()).choose(random);
randomizedConfig.put("clock_drift_sequence", kindOfDriftSequence.toString());
Expand All @@ -758,8 +735,7 @@ public ClusterSimulation(RandomSource random, long seed, int uniqueNum,

Failures failures = new Failures();
ThreadAllocator threadAllocator = new ThreadAllocator(random, builder.threadCount, numOfNodes);
List<String> allowedDiskAccessModes = Arrays.asList("mmap", "mmap_index_only", "standard");
String disk_access_mode = allowedDiskAccessModes.get(random.uniform(0, allowedDiskAccessModes.size() - 1));
String disk_access_mode = "standard";
randomizedConfig.put("disk_access_mode", disk_access_mode);
boolean commitlogCompressed = random.decide(.5f);
cluster = snitch.setup(Cluster.build(numOfNodes)
Expand Down