Updated Branches: refs/heads/cassandra-2.0 db69dceeb -> 8b8c159f4 refs/heads/trunk e3d1e38a4 -> f07aa3999
Mark EPS as dead before sending echo command. Patch by Sankalp Kohli, reviewed by brandonwilliams for CASSANDRA-6571 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8b8c159f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b8c159f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b8c159f Branch: refs/heads/cassandra-2.0 Commit: 8b8c159f4de8f657a7bee73a96f05c307eb2e8c0 Parents: db69dce Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Jan 13 09:14:22 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Jan 13 09:14:22 2014 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/gms/Gossiper.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b8c159f/src/java/org/apache/cassandra/gms/Gossiper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java index 7517768..f0b39d1 100644 --- a/src/java/org/apache/cassandra/gms/Gossiper.java +++ b/src/java/org/apache/cassandra/gms/Gossiper.java @@ -817,6 +817,8 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean return; } + localState.markDead(); + MessageOut<EchoMessage> echoMessage = new MessageOut<EchoMessage>(MessagingService.Verb.ECHO, new EchoMessage(), EchoMessage.serializer); logger.trace("Sending a EchoMessage to {}", addr); IAsyncCallback echoHandler = new IAsyncCallback()