This is an automated email from the ASF dual-hosted git repository.
ifesdjeen pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 0d5ccb9c2f65ddee4a1b18b76800b7b88d3c6379
Merge: 4772b66 d90dc87
Author: Alex Petrov <oleksandr.pet...@gmail.com>
AuthorDate: Mon Nov 11 15:37:27 2019 +0100
Merge branch 'cassandra-3.0' into cassandra-3.11
.../apache/cassandra/service/CassandraDaemon.java | 66 +++++----
.../apache/cassandra/distributed/api/Feature.java | 2 +-
.../cassandra/distributed/api/IInstance.java | 2 +
.../apache/cassandra/distributed/api/IListen.java | 2 +
.../distributed/impl/AbstractCluster.java | 158 +++++++++++++++++----
.../cassandra/distributed/impl/Instance.java | 21 +++
.../distributed/impl/InstanceClassLoader.java | 16 ++-
.../cassandra/distributed/impl/InstanceConfig.java | 34 +++--
.../apache/cassandra/distributed/impl/Listen.java | 20 ++-
.../apache/cassandra/distributed/impl/RowUtil.java | 17 +++
.../distributed/test/DistributedTestBase.java | 7 +
.../distributed/test/NativeProtocolTest.java | 59 ++++++++
.../distributed/test/ResourceLeakTest.java | 16 +++
13 files changed, 349 insertions(+), 71 deletions(-)
diff --cc src/java/org/apache/cassandra/service/CassandraDaemon.java
index a3d18a3,32fd97c..16a6145
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@@ -79,10 -84,17 +79,16 @@@ import org.apache.cassandra.security.Th
public class CassandraDaemon
{
public static final String MBEAN_NAME =
"org.apache.cassandra.db:type=NativeAccess";
- private static JMXConnectorServer jmxServer = null;
private static final Logger logger;
- static
+
+ @VisibleForTesting
+ public static CassandraDaemon getInstanceForTesting()
{
+ return instance;
+ }
+
+ static {
// Need to register metrics before instrumented appender is
created(first access to LoggerFactory).
SharedMetricRegistries.getOrCreate("logback-metrics").addListener(new
MetricRegistryListener.Base()
{
@@@ -660,12 -633,7 +667,12 @@@
}
}
+ public void applyConfig()
+ {
+ DatabaseDescriptor.daemonInitialization();
+ }
+
- public void startNativeTransport()
+ public void validateTransportsCanStart()
{
// We only start transports if bootstrap has completed and we're not
in survey mode, OR if we are in
// survey mode and streaming has completed but we're not using auth.
diff --cc
test/distributed/org/apache/cassandra/distributed/impl/InstanceConfig.java
index 6c3b839,3bde605..d36487e
--- a/test/distributed/org/apache/cassandra/distributed/impl/InstanceConfig.java
+++ b/test/distributed/org/apache/cassandra/distributed/impl/InstanceConfig.java
@@@ -94,9 -99,10 +99,10 @@@ public class InstanceConfig implements
.set("data_file_directories", data_file_directories)
.set("commitlog_directory", commitlog_directory)
.set("hints_directory", hints_directory)
-// .set("cdc_directory", cdc_directory)
+ .set("cdc_raw_directory", cdc_raw_directory)
.set("initial_token", initial_token)
.set("partitioner",
"org.apache.cassandra.dht.Murmur3Partitioner")
+ .set("start_native_transport", true)
.set("concurrent_writes", 2)
.set("concurrent_counter_writes", 2)
.set("concurrent_materialized_view_writes", 2)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
