natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Try harder to not let a node flap after the gossip goodbye. 

Patch by brandonwilliams, reviewed by jasobrown for CASSANDRA-5254
This commit is contained in:
Brandon Williams 2013-03-06 15:52:30 -06:00
parent aba9a17742
commit 2b87bfe552
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java
View File

@ -44,6 +44,12 @@ public class GossipDigestAck2VerbHandler implements IVerbHandler
InetAddress from = message.getFrom(); InetAddress from = message.getFrom();
logger_.trace("Received a GossipDigestAck2Message from {}", from); logger_.trace("Received a GossipDigestAck2Message from {}", from);
} }
if (!Gossiper.instance.isEnabled())
{
if (logger_.isTraceEnabled())
logger_.trace("Ignoring GossipDigestAck2Message because gossip is disabled");
return;
}
byte[] bytes = message.getMessageBody(); byte[] bytes = message.getMessageBody();
DataInputStream dis = new DataInputStream( new FastByteArrayInputStream(bytes) ); DataInputStream dis = new DataInputStream( new FastByteArrayInputStream(bytes) );

2
src/java/org/apache/cassandra/gms/Gossiper.java
View File

@ -1134,7 +1134,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
logger.info("Announcing shutdown"); logger.info("Announcing shutdown");
try try
{ {
Thread.sleep(intervalInMillis); Thread.sleep(intervalInMillis * 2);
} }
catch (InterruptedException e) catch (InterruptedException e)
{ {