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 b8209a06fbad6d5dda239f06ea889a4a89427296
Merge: 3d220b5a6e edde699a06
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Fri Sep 15 12:25:40 2023 -0500
Merge branch 'cassandra-4.0' into cassandra-4.1
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 47 ++-----------------------
2 files changed, 4 insertions(+), 44 deletions(-)
diff --cc CHANGES.txt
index 8bb36cc504,62c49d6fd0..2134d0b77b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -8,7 -3,9 +8,8 @@@ Merged from 4.0
* Fix BulkLoader ignoring cipher suites options (CASSANDRA-18582)
* Migrate Python optparse to argparse (CASSANDRA-17914)
Merged from 3.11:
+ * Revert CASSANDRA-18543 (CASSANDRA-18854)
* Fix NPE when using udfContext in UDF after a restart of a node
(CASSANDRA-18739)
- * Moved jflex from runtime to build dependencies (CASSANDRA-18664)
Merged from 3.0:
* Add cqlshrc.sample and credentials.sample into Debian package
(CASSANDRA-18818)
* Refactor validation logic in StorageService.rebuild (CASSANDRA-18803)
diff --cc src/java/org/apache/cassandra/gms/Gossiper.java
index 854da29acb,2b3c48ed77..4a32662dcf
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@@ -42,12 -35,11 +42,11 @@@ import com.google.common.collect.Immuta
import com.google.common.collect.Iterables;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
-import com.google.common.util.concurrent.ListenableFutureTask;
import com.google.common.util.concurrent.Uninterruptibles;
-import org.apache.cassandra.concurrent.JMXEnabledSingleThreadExecutor;
+import org.apache.cassandra.concurrent.*;
+import org.apache.cassandra.concurrent.FutureTask;
import org.apache.cassandra.config.CassandraRelevantProperties;
- import org.apache.cassandra.exceptions.RequestFailureReason;
import org.apache.cassandra.locator.InetAddressAndPort;
import org.apache.cassandra.net.NoPayload;
import org.apache.cassandra.net.Verb;
@@@ -660,11 -633,7 +656,10 @@@ public class Gossiper implements IFailu
logger.warn("Seeds list is now empty!");
}
+ if (disableEndpointRemoval)
+ return;
+
liveEndpoints.remove(endpoint);
- inflightEcho.remove(endpoint);
unreachableEndpoints.remove(endpoint);
MessagingService.instance().versions.reset(endpoint);
quarantineEndpoint(endpoint);
@@@ -1429,12 -1335,8 +1392,11 @@@
private void silentlyMarkDead(InetAddressAndPort addr, EndpointState
localState)
{
localState.markDead();
- liveEndpoints.remove(addr);
- unreachableEndpoints.put(addr, System.nanoTime());
+ if (!disableEndpointRemoval)
+ {
+ liveEndpoints.remove(addr);
- inflightEcho.remove(addr);
+ unreachableEndpoints.put(addr, nanoTime());
+ }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
