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

Use default commitlog settings in test YAMLs 

patch by Caleb Rackliffe; reviewed by David Capwell for CASSANDRA-19830
This commit is contained in:
Caleb Rackliffe 2024-08-13 21:12:14 -05:00
parent b8e08840ee
commit 93415c91af
11 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,4 +1,5 @@
4.0.14
* Use default commitlog settings in test YAMLs (CASSANDRA-19830)
* Do not spam log with SSLExceptions (CASSANDRA-18839)
* Fix schema.cql created by a snapshot after dropping more than one column (CASSANDRA-19747)
* UnsupportedOperationException when reducing scope for LCS compactions (CASSANDRA-19704)

4
test/conf/cassandra-murmur.yaml
View File

@ -4,8 +4,8 @@
#
cluster_name: Test Cluster
memtable_allocation_type: heap_buffers
commitlog_sync: batch
commitlog_sync_batch_window_in_ms: 1.0
commitlog_sync: periodic
commitlog_sync_period_in_ms: 10000
commitlog_segment_size_in_mb: 5
commitlog_directory: build/test/cassandra/commitlog
cdc_raw_directory: build/test/cassandra/cdc_raw

4
test/conf/cassandra-seeds.yaml
View File

@ -5,8 +5,8 @@
cluster_name: Test Cluster
# memtable_allocation_type: heap_buffers
memtable_allocation_type: offheap_objects
commitlog_sync: batch
commitlog_sync_batch_window_in_ms: 1.0
commitlog_sync: periodic
commitlog_sync_period_in_ms: 10000
commitlog_segment_size_in_mb: 5
commitlog_directory: build/test/cassandra/commitlog
cdc_raw_directory: build/test/cassandra/cdc_raw

4
test/conf/cassandra.yaml
View File

@ -5,8 +5,8 @@
cluster_name: Test Cluster
memtable_allocation_type: heap_buffers
# memtable_allocation_type: offheap_objects
commitlog_sync: batch
commitlog_sync_batch_window_in_ms: 1.0
commitlog_sync: periodic
commitlog_sync_period_in_ms: 10000
commitlog_segment_size_in_mb: 5
commitlog_directory: build/test/cassandra/commitlog
# commitlog_compression:

4
test/conf/unit-test-conf/test-native-port.yaml
View File

@ -5,8 +5,8 @@
cluster_name: Test Cluster
# memtable_allocation_type: heap_buffers
memtable_allocation_type: offheap_objects
commitlog_sync: batch
commitlog_sync_batch_window_in_ms: 1.0
commitlog_sync: periodic
commitlog_sync_period_in_ms: 10000
commitlog_segment_size_in_mb: 5
commitlog_directory: build/test/cassandra/commitlog
# commitlog_compression:

7
test/distributed/org/apache/cassandra/distributed/impl/InstanceConfig.java
View File

@ -105,7 +105,8 @@ public class InstanceConfig implements IInstanceConfig
.set("memtable_flush_writers", 1)
.set("concurrent_compactors", 1)
.set("memtable_heap_space_in_mb", 10)
.set("commitlog_sync", "batch")
.set("commitlog_sync", "periodic")
.set("commitlog_sync_period_in_ms", 10000)
.set("storage_port", storage_port)
.set("native_transport_port", native_transport_port)
.set("endpoint_snitch", DistributedTestSnitch.class.getName())
@ -117,9 +118,7 @@ public class InstanceConfig implements IInstanceConfig
// capacities that are based on `totalMemory` that should be fixed size
.set("index_summary_capacity_in_mb", 50l)
.set("counter_cache_size_in_mb", 50l)
.set("key_cache_size_in_mb", 50l)
// legacy parameters
.forceSet("commitlog_sync_batch_window_in_ms", 1.0);
.set("key_cache_size_in_mb", 50l);
this.featureFlags = EnumSet.noneOf(Feature.class);
this.jmxPort = jmx_port;
}

1
test/distributed/org/apache/cassandra/distributed/test/RepairBoundaryTest.java
View File

@ -163,7 +163,6 @@ public class RepairBoundaryTest extends TestBaseImpl
{
cluster = Cluster.build(3)
.withConfig(config -> config.set("hinted_handoff_enabled", false)
.set("commitlog_sync_batch_window_in_ms", 5)
.set("num_tokens", 1)
.set("initial_token", Long.toString(config.num() * 1000))
.with(NETWORK)

1
test/distributed/org/apache/cassandra/distributed/test/RepairTest.java
View File

@ -84,7 +84,6 @@ public class RepairTest extends TestBaseImpl
{
configModifier = configModifier.andThen(
config -> config.set("hinted_handoff_enabled", false)
.set("commitlog_sync_batch_window_in_ms", 5)
.with(NETWORK)
.with(GOSSIP)
);

4
test/distributed/org/apache/cassandra/distributed/test/ReplicaFilteringProtectionTest.java
View File

@ -57,7 +57,6 @@ public class ReplicaFilteringProtectionTest extends TestBaseImpl
cluster = init(Cluster.build()
.withNodes(REPLICAS)
.withConfig(config -> config.set("hinted_handoff_enabled", false)
.set("commitlog_sync", "batch")
.set("num_tokens", 1)).start());
// Make sure we start w/ the correct defaults:
@ -68,7 +67,8 @@ public class ReplicaFilteringProtectionTest extends TestBaseImpl
@AfterClass
public static void teardown()
{
cluster.close();
if (cluster != null)
cluster.close();
}
@Test

13
test/unit/org/apache/cassandra/cql3/CQLTester.java
View File

@ -268,14 +268,21 @@ public abstract class CQLTester
@BeforeClass
public static void setUpClass()
{
if (ROW_CACHE_SIZE_IN_MB > 0)
DatabaseDescriptor.setRowCacheSizeInMB(ROW_CACHE_SIZE_IN_MB);
StorageService.instance.setPartitionerUnsafe(Murmur3Partitioner.instance);
prePrepareServer();
// Once per-JVM is enough
prepareServer();
}
protected static void prePrepareServer()
{
System.setProperty("cassandra.superuser_setup_delay_ms", "0");
if (ROW_CACHE_SIZE_IN_MB > 0)
DatabaseDescriptor.setRowCacheSizeInMB(ROW_CACHE_SIZE_IN_MB);
StorageService.instance.setPartitionerUnsafe(Murmur3Partitioner.instance);
}
@AfterClass
public static void tearDownClass()
{

9
test/unit/org/apache/cassandra/db/commitlog/CommitLogReaderTest.java
View File

@ -43,10 +43,17 @@ import org.apache.cassandra.utils.KillerForTests;
public class CommitLogReaderTest extends CQLTester
{
@BeforeClass
public static void beforeClass()
public static void setUpClass()
{
prePrepareServer();
DatabaseDescriptor.setCommitFailurePolicy(Config.CommitFailurePolicy.ignore);
JVMStabilityInspector.replaceKiller(new KillerForTests(false));
DatabaseDescriptor.setCommitLogSync(Config.CommitLogSync.batch);
// Once per-JVM is enough
prepareServer();
}
@Before