This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch CASSANDRA-16588-trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 8fa270d26a25f862a5bcccc90ec73a2c3435edfc
Author: Brandon Williams <[email protected]>
AuthorDate: Fri Apr 16 14:13:13 2021 -0500

    Filter out dead states
---
 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 34bdb1b..e54fbc0 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -1974,7 +1974,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.getBroadcastAddressAndPort());
         // 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(InetAddressAndPort respondent, 
boolean isInShadowRound, Map<InetAddressAndPort, EndpointState> epStateMap)

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to