Merge branch 'cassandra-1.1' into cassandra-1.2
Conflicts:
src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/268e5b1f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/268e5b1f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/268e5b1f
Branch: refs/heads/trunk
Commit: 268e5b1fe7442e9a786b53ff280ff6416d4ab83d
Parents: b7e1082 2b87bfe
Author: Brandon Williams <[email protected]>
Authored: Wed Mar 6 16:05:54 2013 -0600
Committer: Brandon Williams <[email protected]>
Committed: Wed Mar 6 16:05:54 2013 -0600
----------------------------------------------------------------------
.../cassandra/gms/GossipDigestAck2VerbHandler.java | 6 ++++++
src/java/org/apache/cassandra/gms/Gossiper.java | 2 +-
2 files changed, 7 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/268e5b1f/src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java
index 3fb9255,84bc3cb..35d3f90
--- a/src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java
+++ b/src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java
@@@ -23,21 -29,40 +23,27 @@@ import java.util.Map
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.cassandra.io.util.FastByteArrayInputStream;
import org.apache.cassandra.net.IVerbHandler;
-import org.apache.cassandra.net.Message;
+import org.apache.cassandra.net.MessageIn;
-public class GossipDigestAck2VerbHandler implements IVerbHandler
+public class GossipDigestAck2VerbHandler implements
IVerbHandler<GossipDigestAck2>
{
- private static Logger logger_ =
LoggerFactory.getLogger(GossipDigestAck2VerbHandler.class);
+ private static final Logger logger =
LoggerFactory.getLogger(GossipDigestAck2VerbHandler.class);
- public void doVerb(Message message, String id)
+ public void doVerb(MessageIn<GossipDigestAck2> message, String id)
{
- if (logger_.isTraceEnabled())
+ if (logger.isTraceEnabled())
{
- InetAddress from = message.getFrom();
- logger_.trace("Received a GossipDigestAck2Message from {}", from);
+ InetAddress from = message.from;
+ logger.trace("Received a GossipDigestAck2Message from {}", from);
}
+ if (!Gossiper.instance.isEnabled())
+ {
- if (logger_.isTraceEnabled())
- logger_.trace("Ignoring GossipDigestAck2Message because
gossip is disabled");
++ if (logger.isTraceEnabled())
++ logger.trace("Ignoring GossipDigestAck2Message because gossip
is disabled");
+ return;
+ }
-
- byte[] bytes = message.getMessageBody();
- DataInputStream dis = new DataInputStream( new
FastByteArrayInputStream(bytes) );
- GossipDigestAck2Message gDigestAck2Message;
- try
- {
- gDigestAck2Message =
GossipDigestAck2Message.serializer().deserialize(dis, message.getVersion());
- }
- catch (IOException e)
- {
- throw new RuntimeException(e);
- }
- Map<InetAddress, EndpointState> remoteEpStateMap =
gDigestAck2Message.getEndpointStateMap();
+ Map<InetAddress, EndpointState> remoteEpStateMap =
message.payload.getEndpointStateMap();
/* Notify the Failure Detector */
Gossiper.instance.notifyFailureDetector(remoteEpStateMap);
Gossiper.instance.applyStateLocally(remoteEpStateMap);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/268e5b1f/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
