natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-5.0' into trunk 

* cassandra-5.0:
  ninja-fix: remove SSTable format and disk access mode randomization
This commit is contained in:
Caleb Rackliffe 2026-03-27 11:52:02 -05:00
parent bf755d0ade 32d541557c
commit 2184d5cc6b
1 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
test/simulator/main/org/apache/cassandra/simulator/ClusterSimulation.java
View File

@ -228,7 +228,6 @@ public class ClusterSimulation<S extends Simulation> implements AutoCloseable
protected PerVerbFutureActionSchedulersFactory perVerbFutureActionSchedulersFactory;
protected String memtableType = null;
protected String memtableAllocationType = null;
protected String sstableFormat = null;
public Builder<S> failures(Failures failures)
{
@ -644,12 +643,6 @@ public class ClusterSimulation<S extends Simulation> implements AutoCloseable
return this;
}
public Builder<S> sstableFormat(String format)
{
this.sstableFormat = format;
return this;
}
public abstract ClusterSimulation<S> create(long seed) throws IOException;
}
@ -838,19 +831,6 @@ public class ClusterSimulation<S extends Simulation> implements AutoCloseable
}
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);
KindOfSequence kindOfDriftSequence = Choices.uniform(KindOfSequence.values()).choose(random);
KindOfSequence kindOfDiscontinuitySequence = Choices.uniform(KindOfSequence.values()).choose(random);
randomizedConfig.put("clock_drift_sequence", kindOfDriftSequence.toString());
@ -907,8 +887,7 @@ public class ClusterSimulation<S extends Simulation> implements AutoCloseable
.set("commitlog_compression", new ParameterizedClass(LZ4Compressor.class.getName(), emptyMap()))
.set("commitlog_sync", "batch")
.set("accord.journal.flush_mode", "BATCH")
.set("accord.command_store_shard_count", "4")
.set("sstable", Map.of("selected_format", sstableFormat));
.set("accord.command_store_shard_count", "4");
if (memtableType.equals("TrieMemtable"))
{