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
commit c6017aca778df72e1944b1855c902027b8abad7f
Merge: 103e9cca1a 057d082e00
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Wed May 8 10:22:07 2024 -0500
Merge branch 'cassandra-4.0' into cassandra-4.1
CHANGES.txt | 1 +
conf/jvm-server.options | 4 ++
.../config/CassandraRelevantProperties.java | 2 +
src/java/org/apache/cassandra/gms/Gossiper.java | 46 ++++++++++++++++++++--
.../org/apache/cassandra/gms/VersionedValue.java | 2 +
5 files changed, 52 insertions(+), 3 deletions(-)
diff --cc CHANGES.txt
index 0095e2d078,2d56a56c61..2f31f4a2e2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
-4.0.14
+4.1.6
+Merged from 4.0:
+ * Add timeout specifically for bootstrapping nodes (CASSANDRA-15439)
* Bring Redhat packge dirs/ownership/perms in line with Debian package
(CASSANDRA-19565)
diff --cc src/java/org/apache/cassandra/gms/Gossiper.java
index 9be48f96bb,009e6b255f..ff1264d6fa
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@@ -272,9 -258,28 +276,28 @@@ public class Gossiper implements IFailu
return 259200 * 1000; // 3 days
}
+ private static long getFailedBootstrapTimeout()
+ {
+ String newtimeout =
CassandraRelevantProperties.FAILED_BOOTSTRAP_TIMEOUT.getString();
+ if (newtimeout != null)
+ {
+ long longValue = Long.parseLong(newtimeout);
+ if (longValue == -1)
+ {
+ longValue = Long.MAX_VALUE;
+ }
+ logger.info("Overriding FAILED_BOOTSTRAP_TIMEOUT to {}ms",
longValue);
+ return longValue;
+ }
+ else
+ {
+ return FAT_CLIENT_TIMEOUT * 2;
+ }
+ }
+
private static boolean isInGossipStage()
{
- return ((JMXEnabledSingleThreadExecutor)
Stage.GOSSIP.executor()).isExecutedBy(Thread.currentThread());
+ return Stage.GOSSIP.executor().inExecutor();
}
private static void checkProperThreadForStateMutation()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
