You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2024/11/19 00:04:23 UTC
(cassandra) branch cassandra-4.1 updated (94bc2203fd -> 7559e2708a)
This is an automated email from the ASF dual-hosted git repository.
mck pushed a change to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 94bc2203fd Merge branch 'cassandra-4.0' into cassandra-4.1
new 426eebb513 A node should always return back the full information about itself for gossip regardless the asked heartbeat version
new 7559e2708a Merge branch 'cassandra-4.0' into cassandra-4.1
The 2 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/gms/GossipDigestAckVerbHandler.java | 5 +-
src/java/org/apache/cassandra/gms/Gossiper.java | 8 +-
.../cassandra/distributed/test/GossipTest.java | 133 +++++++++++++++++++++
4 files changed, 145 insertions(+), 2 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-4.0' into cassandra-4.1
Posted by mc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 7559e2708a5bad426ae9cfd44cd6358824d58bea
Merge: 94bc2203fd 426eebb513
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Tue Nov 19 00:36:50 2024 +0100
Merge branch 'cassandra-4.0' into cassandra-4.1
* cassandra-4.0:
A node should always return back the full information about itself for gossip regardless the asked heartbeat version
CHANGES.txt | 1 +
.../cassandra/gms/GossipDigestAckVerbHandler.java | 5 +-
src/java/org/apache/cassandra/gms/Gossiper.java | 8 +-
.../cassandra/distributed/test/GossipTest.java | 133 +++++++++++++++++++++
4 files changed, 145 insertions(+), 2 deletions(-)
diff --cc CHANGES.txt
index 940f2aac92,1e25031aeb..0bf763ff26
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,8 +1,10 @@@
-4.0.16
+4.1.8
+ * Add nodetool checktokenmetadata command that checks TokenMetadata is insync with Gossip endpointState (CASSANDRA-18758)
+ * Backport Java 11 support for Simulator (CASSANDRA-17178/CASSANDRA-19935)
+ * Equality check for Paxos.Electorate should not depend on collection types (CASSANDRA-19935)
+ * Fix race condition in DecayingEstimatedHistogramReservoir during rescale (CASSANDRA-19365)
+Merged from 4.0:
+ * Fix gossip issue with gossip-only and bootstrapping nodes missing DC/Rack/Host ID endpoint state (CASSANDRA-19983)
-
-
-4.0.15
* Change the resolution of AbstractCommitLogService#lastSyncedAt to nanos to be aligned with later comparisons (CASSANDRA-20074)
* Backport of CASSANDRA-17812: Rate-limit new client connection auth setup to avoid overwhelming bcrypt (CASSANDRA-20057)
* Support UDTs and vectors as clustering keys in descending order (CASSANDRA-20050)
diff --cc src/java/org/apache/cassandra/gms/GossipDigestAckVerbHandler.java
index 5fbe7ce0e3,e8a4dca94a..b322a60aa8
--- a/src/java/org/apache/cassandra/gms/GossipDigestAckVerbHandler.java
+++ b/src/java/org/apache/cassandra/gms/GossipDigestAckVerbHandler.java
@@@ -27,9 -27,9 +27,10 @@@ import org.slf4j.LoggerFactory
import org.apache.cassandra.locator.InetAddressAndPort;
import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.MessagingService;
+ import org.apache.cassandra.utils.FBUtilities;
import static org.apache.cassandra.net.Verb.GOSSIP_DIGEST_ACK2;
+import static org.apache.cassandra.utils.Clock.Global.nanoTime;
public class GossipDigestAckVerbHandler extends GossipVerbHandler<GossipDigestAck>
{
diff --cc src/java/org/apache/cassandra/gms/Gossiper.java
index c54eaafcd1,9a7a9935b8..0175df0bbc
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@@ -1179,17 -1142,15 +1179,23 @@@ public class Gossiper implements IFailu
return storedTime == null ? computeExpireTime() : storedTime;
}
+ public EndpointState getEndpointStateForEndpoint(InetAddressAndPort ep)
+ {
+ return endpointStateMap.get(ep);
+ }
+
+ @VisibleForTesting
+ public boolean inJustRemovedEndpoints(InetAddressAndPort ep)
+ {
+ return justRemovedEndpoints.containsKey(ep);
+ }
+
- public EndpointState getEndpointStateForEndpoint(InetAddressAndPort ep)
+ public EndpointState copyEndpointStateForEndpoint(InetAddressAndPort ep)
{
- return endpointStateMap.get(ep);
+ EndpointState epState = endpointStateMap.get(ep);
+ if (epState == null)
+ return null;
+ return new EndpointState(epState);
}
public ImmutableSet<InetAddressAndPort> getEndpoints()
diff --cc test/distributed/org/apache/cassandra/distributed/test/GossipTest.java
index c5f2a07e13,f68bbc671a..a2bd09325d
--- a/test/distributed/org/apache/cassandra/distributed/test/GossipTest.java
+++ b/test/distributed/org/apache/cassandra/distributed/test/GossipTest.java
@@@ -37,11 -42,13 +42,14 @@@ import net.bytebuddy.implementation.bin
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.distributed.Cluster;
import org.apache.cassandra.distributed.api.*;
+import org.apache.cassandra.distributed.shared.ClusterUtils;
+ import org.apache.cassandra.distributed.shared.NetworkTopology;
import org.apache.cassandra.gms.ApplicationState;
import org.apache.cassandra.gms.EndpointState;
+ import org.apache.cassandra.gms.GossipDigestSyn;
import org.apache.cassandra.gms.Gossiper;
import org.apache.cassandra.locator.InetAddressAndPort;
+ import org.apache.cassandra.net.Message;
import org.apache.cassandra.service.PendingRangeCalculatorService;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.streaming.StreamPlan;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org