This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch CASSANDRA-16588 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit e68602ae300e6a2567e1b59efa4229ff3456e521 Author: Matt Fleming <[email protected]> AuthorDate: Fri Apr 16 17:05:42 2021 +0100 Filter out dead states from startup safety check --- src/java/org/apache/cassandra/gms/Gossiper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java index 412b2be..6bc25b6 100644 --- a/src/java/org/apache/cassandra/gms/Gossiper.java +++ b/src/java/org/apache/cassandra/gms/Gossiper.java @@ -1705,7 +1705,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean // it is possible for a previously queued ack to be sent to us when we come back up in shadow EndpointState localState = epStateMap.get(FBUtilities.getBroadcastAddress()); // return false if response doesn't contain state necessary for safety check - return localState == null || localState.containsApplicationState(ApplicationState.HOST_ID); + return localState == null || isDeadState(localState) || localState.containsApplicationState(ApplicationState.HOST_ID); } protected void maybeFinishShadowRound(InetAddress respondent, boolean isInShadowRound, Map<InetAddress, EndpointState> epStateMap) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
