Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/gms/Gossiper.java src/java/org/apache/cassandra/transport/Server.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4597bb5b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4597bb5b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4597bb5b Branch: refs/heads/trunk Commit: 4597bb5b1687048a2dd57bfea679e987637c5fcc Parents: b25adc7 763130b Author: T Jake Luciani <j...@apache.org> Authored: Thu Mar 19 13:50:39 2015 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Thu Mar 19 13:50:39 2015 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/gms/EndpointState.java | 12 ------------ src/java/org/apache/cassandra/gms/Gossiper.java | 12 ++---------- src/java/org/apache/cassandra/transport/Server.java | 11 +++++++++-- 3 files changed, 11 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4597bb5b/src/java/org/apache/cassandra/gms/Gossiper.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/gms/Gossiper.java index d7b1ec7,9c0ef8a..ff1240a --- a/src/java/org/apache/cassandra/gms/Gossiper.java +++ b/src/java/org/apache/cassandra/gms/Gossiper.java @@@ -891,15 -883,9 +891,9 @@@ public class Gossiper implements IFailu return; } - if (localState.hasPendingEcho()) - { - logger.debug("{} has already a pending echo, skipping it", localState); - return; - } - localState.markDead(); - MessageOut<EchoMessage> echoMessage = new MessageOut<EchoMessage>(MessagingService.Verb.ECHO, new EchoMessage(), EchoMessage.serializer); + MessageOut<EchoMessage> echoMessage = new MessageOut<EchoMessage>(MessagingService.Verb.ECHO, EchoMessage.instance, EchoMessage.serializer); logger.trace("Sending a EchoMessage to {}", addr); IAsyncCallback echoHandler = new IAsyncCallback() { http://git-wip-us.apache.org/repos/asf/cassandra/blob/4597bb5b/src/java/org/apache/cassandra/transport/Server.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/transport/Server.java index 6aa929b,8f0f89f..e6e0a8f --- a/src/java/org/apache/cassandra/transport/Server.java +++ b/src/java/org/apache/cassandra/transport/Server.java @@@ -22,8 -22,9 +22,10 @@@ import java.net.InetAddress import java.net.InetSocketAddress; import java.net.UnknownHostException; import java.util.EnumMap; + import java.util.Map; +import java.util.List; import java.util.concurrent.Callable; + import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine;