You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2024/08/15 16:27:47 UTC
(cassandra) branch trunk updated (7275fc0a88 -> cf2cde7017)
This is an automated email from the ASF dual-hosted git repository.
maedhroz pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 7275fc0a88 Merge branch 'cassandra-5.0' into trunk
new 93415c91af Use default commitlog settings in test YAMLs
new e5fc9b3e14 Merge branch 'cassandra-4.0' into cassandra-4.1
new c91ffe8a9f Merge branch 'cassandra-4.1' into cassandra-5.0.0
new 47fe3a12cf Merge branch 'cassandra-5.0.0' into cassandra-5.0
new cf2cde7017 Merge branch 'cassandra-5.0' into trunk
The 5 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:
CHANGES.txt | 1 +
.../cassandra-mtls-backward-compatibility.yaml | 3 +-
test/conf/cassandra-mtls.yaml | 3 +-
test/conf/cassandra-murmur.yaml | 3 +-
test/conf/cassandra-old.yaml | 3 +-
test/conf/cassandra-pem-jks-sslcontextfactory.yaml | 3 +-
...pem-sslcontextfactory-invalidconfiguration.yaml | 3 +-
...em-sslcontextfactory-mismatching-passwords.yaml | 3 +-
...ndra-pem-sslcontextfactory-unencryptedkeys.yaml | 3 +-
test/conf/cassandra-pem-sslcontextfactory.yaml | 3 +-
test/conf/cassandra-seeds.yaml | 3 +-
...dra-sslcontextfactory-invalidconfiguration.yaml | 3 +-
test/conf/cassandra-sslcontextfactory.yaml | 3 +-
test/conf/cassandra.yaml | 3 +-
test/conf/unit-test-conf/test-native-port.yaml | 3 +-
.../cassandra/distributed/impl/InstanceConfig.java | 3 +-
.../test/ReplicaFilteringProtectionTest.java | 3 +-
.../cassandra/simulator/ClusterSimulation.java | 42 ++++++++++++++--------
.../config/FailStartupDuplicateParamsTest.java | 3 +-
.../LoadOldYAMLBackwardCompatibilityTest.java | 2 +-
.../cassandra/config/ParseAndConvertUnitsTest.java | 2 +-
test/unit/org/apache/cassandra/cql3/CQLTester.java | 10 ++++--
.../db/commitlog/CommitLogReaderTest.java | 9 ++++-
23 files changed, 79 insertions(+), 38 deletions(-)
---------------------------------------------------------------------
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 ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
maedhroz pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit cf2cde7017244f7ade00d5087f3268e2308f17d6
Merge: 7275fc0a88 47fe3a12cf
Author: Caleb Rackliffe <ca...@gmail.com>
AuthorDate: Thu Aug 15 11:10:19 2024 -0500
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
Use default commitlog settings in test YAMLs
CHANGES.txt | 1 +
.../cassandra-mtls-backward-compatibility.yaml | 3 +-
test/conf/cassandra-mtls.yaml | 3 +-
test/conf/cassandra-murmur.yaml | 3 +-
test/conf/cassandra-old.yaml | 3 +-
test/conf/cassandra-pem-jks-sslcontextfactory.yaml | 3 +-
...pem-sslcontextfactory-invalidconfiguration.yaml | 3 +-
...em-sslcontextfactory-mismatching-passwords.yaml | 3 +-
...ndra-pem-sslcontextfactory-unencryptedkeys.yaml | 3 +-
test/conf/cassandra-pem-sslcontextfactory.yaml | 3 +-
test/conf/cassandra-seeds.yaml | 3 +-
...dra-sslcontextfactory-invalidconfiguration.yaml | 3 +-
test/conf/cassandra-sslcontextfactory.yaml | 3 +-
test/conf/cassandra.yaml | 3 +-
test/conf/unit-test-conf/test-native-port.yaml | 3 +-
.../cassandra/distributed/impl/InstanceConfig.java | 3 +-
.../test/ReplicaFilteringProtectionTest.java | 3 +-
.../cassandra/simulator/ClusterSimulation.java | 42 ++++++++++++++--------
.../config/FailStartupDuplicateParamsTest.java | 3 +-
.../LoadOldYAMLBackwardCompatibilityTest.java | 2 +-
.../cassandra/config/ParseAndConvertUnitsTest.java | 2 +-
test/unit/org/apache/cassandra/cql3/CQLTester.java | 10 ++++--
.../db/commitlog/CommitLogReaderTest.java | 9 ++++-
23 files changed, 79 insertions(+), 38 deletions(-)
diff --cc CHANGES.txt
index d734275a61,48c513ebbf..264a5bb548
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -123,10 -67,10 +123,11 @@@ Merged from 4.1
* Fix hints delivery for a node going down repeatedly (CASSANDRA-19495)
* Do not go to disk for reading hints file sizes (CASSANDRA-19477)
* Fix system_views.settings to handle array types (CASSANDRA-19475)
- * Memoize Cassandra verion and add a backoff interval for failed schema pulls (CASSANDRA-18902)
* Fix StackOverflowError on ALTER after many previous schema changes (CASSANDRA-19166)
+ * Memoize Cassandra verion (CASSANDRA-18902)
Merged from 4.0:
++ * 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)
* Make LWT conditions behavior on frozen and non-frozen columns consistent for null column values (CASSANDRA-19637)
diff --cc test/simulator/main/org/apache/cassandra/simulator/ClusterSimulation.java
index b775ae22a6,f7f9346385..ef09270932
--- a/test/simulator/main/org/apache/cassandra/simulator/ClusterSimulation.java
+++ b/test/simulator/main/org/apache/cassandra/simulator/ClusterSimulation.java
@@@ -52,12 -51,10 +52,13 @@@ import org.apache.cassandra.distributed
import org.apache.cassandra.distributed.api.IIsolatedExecutor.SerializableConsumer;
import org.apache.cassandra.distributed.api.IIsolatedExecutor.SerializableRunnable;
import org.apache.cassandra.distributed.impl.DirectStreamingConnectionFactory;
+ import org.apache.cassandra.distributed.impl.InstanceConfig;
+import org.apache.cassandra.distributed.impl.InstanceIDDefiner;
import org.apache.cassandra.distributed.impl.IsolatedExecutor;
import org.apache.cassandra.io.compress.LZ4Compressor;
+import org.apache.cassandra.io.filesystem.ListenableFileSystem;
import org.apache.cassandra.io.util.FileSystems;
+import org.apache.cassandra.net.Verb;
import org.apache.cassandra.service.paxos.BallotGenerator;
import org.apache.cassandra.service.paxos.PaxosPrepare;
import org.apache.cassandra.simulator.RandomSource.Choices;
@@@ -710,21 -676,32 +711,32 @@@ public class ClusterSimulation<S extend
cluster = snitch.setup(Cluster.build(numOfNodes)
.withRoot(fs.getPath("/cassandra"))
.withSharedClasses(sharedClassPredicate)
- .withConfig(config -> configUpdater.accept(threadAllocator.update(config
- .with(Feature.BLANK_GOSSIP)
- .set(Constants.KEY_DTEST_JOIN_RING, false)
- .set("read_request_timeout", String.format("%dms", NANOSECONDS.toMillis(builder.readTimeoutNanos)))
- .set("write_request_timeout", String.format("%dms", NANOSECONDS.toMillis(builder.writeTimeoutNanos)))
- .set("cas_contention_timeout", String.format("%dms", NANOSECONDS.toMillis(builder.contentionTimeoutNanos)))
- .set("request_timeout", String.format("%dms", NANOSECONDS.toMillis(builder.requestTimeoutNanos)))
- .set("memtable_heap_space", "1MiB")
- .set("memtable_allocation_type", builder.memoryListener != null ? "unslabbed_heap_buffers_logged" : "heap_buffers")
- .set("file_cache_size", "16MiB")
- .set("use_deterministic_table_id", true)
- .set("disk_access_mode", "standard")
- .set("failure_detector", SimulatedFailureDetector.Instance.class.getName())
- .set("commitlog_compression", new ParameterizedClass(LZ4Compressor.class.getName(), emptyMap()))
- )))
+ .withConfig(config -> {
+ config.with(Feature.BLANK_GOSSIP)
++ .set(Constants.KEY_DTEST_JOIN_RING, false)
+ .set("read_request_timeout", String.format("%dms", NANOSECONDS.toMillis(builder.readTimeoutNanos)))
+ .set("write_request_timeout", String.format("%dms", NANOSECONDS.toMillis(builder.writeTimeoutNanos)))
+ .set("cas_contention_timeout", String.format("%dms", NANOSECONDS.toMillis(builder.contentionTimeoutNanos)))
+ .set("request_timeout", String.format("%dms", NANOSECONDS.toMillis(builder.requestTimeoutNanos)))
+ .set("memtable_heap_space", "1MiB")
+ .set("memtable_allocation_type", builder.memoryListener != null ? "unslabbed_heap_buffers_logged" : "heap_buffers")
+ .set("file_cache_size", "16MiB")
+ .set("use_deterministic_table_id", true)
- .set("disk_access_mode", disk_access_mode)
++ .set("disk_access_mode", "standard")
+ .set("failure_detector", SimulatedFailureDetector.Instance.class.getName())
++ .set("commitlog_compression", new ParameterizedClass(LZ4Compressor.class.getName(), emptyMap()))
+ .set("commitlog_sync", "batch");
+
+ // TODO: Add remove() to IInstanceConfig
+ if (config instanceof InstanceConfig)
+ {
+ InstanceConfig instanceConfig = (InstanceConfig) config;
+ instanceConfig.remove("commitlog_sync_period_in_ms");
+ instanceConfig.remove("commitlog_sync_period");
+ }
+
- if (commitlogCompressed)
- config.set("commitlog_compression", new ParameterizedClass(LZ4Compressor.class.getName(), emptyMap()));
+ configUpdater.accept(threadAllocator.update(config));
+ })
.withInstanceInitializer(new IInstanceInitializer()
{
@Override
diff --cc test/unit/org/apache/cassandra/cql3/CQLTester.java
index 6195fce256,6eade9333e..00cee8e573
--- a/test/unit/org/apache/cassandra/cql3/CQLTester.java
+++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java
@@@ -407,28 -397,23 +407,34 @@@ public abstract class CQLTeste
return new JMXServiceURL(String.format("service:jmx:rmi:///jndi/rmi://%s:%d/jmxrmi", jmxHost, jmxPort));
}
+ /**
+ * If a fixture needs to use a specific partitioner other than M3P, it should shadow this method
+ * with an implementation like:
+ * @BeforeClass
+ * public static void setUpClass() // overrides CQLTester.setUpClass()
+ * {
+ * daemonInitialization();
+ * DatabaseDescriptor.setPartitionerUnsafe(ByteOrderedPartitioner.instance);
+ * prepareServer();
+ * }
+ */
@BeforeClass
public static void setUpClass()
+ {
+ prePrepareServer();
+
+ // Once per-JVM is enough
+ prepareServer();
+ }
+
+ protected static void prePrepareServer()
{
CassandraRelevantProperties.SUPERUSER_SETUP_DELAY_MS.setLong(0);
ServerTestUtils.daemonInitialization();
-
if (ROW_CACHE_SIZE_IN_MIB > 0)
DatabaseDescriptor.setRowCacheSizeInMiB(ROW_CACHE_SIZE_IN_MIB);
+ StorageService.instance.registerMBeans();
StorageService.instance.setPartitionerUnsafe(Murmur3Partitioner.instance);
- // Once per-JVM is enough
- prepareServer();
}
@AfterClass
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org