This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-4.1 by this push:
new f5dc9a1c1e Set default FD in DD client initialization
f5dc9a1c1e is described below
commit f5dc9a1c1e27ac5ea0cb972ceaf68d5993804d6f
Author: Brandon Williams <[email protected]>
AuthorDate: Wed Aug 10 08:19:50 2022 -0500
Set default FD in DD client initialization
Patch by Doug Rohrer; reviewed by brandonwilliams and maedhroz for
CASSANDRA-17782
---
CHANGES.txt | 1 +
src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +-
.../org/apache/cassandra/io/sstable/CQLSSTableWriterClientTest.java | 1 -
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 09223c70ec..861a6f5358 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
4.1-alpha2
+ * DatabaseDescriptor will set the default failure detector during client
initialization (CASSANDRA-17782)
* Avoid initializing schema via SystemKeyspace.getPreferredIP() with the
BulkLoader tool (CASSANDRA-17740)
* Uncomment prepared_statements_cache_size, key_cache_size,
counter_cache_size, index_summary_capacity which were
commented out by mistake in a previous patch
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 8543103b5c..77f3c37681 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -283,7 +283,7 @@ public class DatabaseDescriptor
if (clientInitialized)
return;
clientInitialized = true;
-
+ setDefaultFailureDetector();
Config.setClientMode(true);
conf = new Config();
diskOptimizationStrategy = new SpinningDiskOptimizationStrategy();
diff --git
a/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterClientTest.java
b/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterClientTest.java
index 44b2399088..5ee2768c7b 100644
--- a/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterClientTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterClientTest.java
@@ -41,7 +41,6 @@ public class CQLSSTableWriterClientTest
public void setUp()
{
this.testDirectory = new File(Files.createTempDir());
- DatabaseDescriptor.setDefaultFailureDetector();
DatabaseDescriptor.clientInitialization();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
