cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [7/7] git commit: Merge branch 'cassandra-2.1' into trunk
Date Fri, 17 Oct 2014 20:14:41 GMT
Merge branch 'cassandra-2.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b6b08f28
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b6b08f28
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b6b08f28

Branch: refs/heads/trunk
Commit: b6b08f281bc763a7d7a16d950593c7f8466d9328
Parents: fea7d9a 42f8590
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Fri Oct 17 15:14:21 2014 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Fri Oct 17 15:14:21 2014 -0500

----------------------------------------------------------------------
 NEWS.txt                                        | 13 +++++++++++++
 debian/changelog                                |  6 ++++++
 src/java/org/apache/cassandra/gms/Gossiper.java |  2 +-
 3 files changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6b08f28/NEWS.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6b08f28/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/gms/Gossiper.java
index ebe05d2,3fdee88..e698adf
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@@ -993,9 -985,9 +993,9 @@@ public class Gossiper implements IFailu
                  int localGeneration = localEpStatePtr.getHeartBeatState().getGeneration();
                  int remoteGeneration = remoteState.getHeartBeatState().getGeneration();
                  if (logger.isTraceEnabled())
 -                    logger.trace(ep + "local generation " + localGeneration + ", remote
generation " + remoteGeneration);
 +                    logger.trace("{} local generation {}, remote generation {}", ep, localGeneration,
remoteGeneration);
  
-                 if (remoteGeneration > localGeneration + MAX_GENERATION_DIFFERENCE)
+                 if (localGeneration != 0 && remoteGeneration > localGeneration
+ MAX_GENERATION_DIFFERENCE)
                  {
                      // assume some peer has corrupted memory and is broadcasting an unbelievable
generation about another peer (or itself)
                      logger.warn("received an invalid gossip generation for peer {}; local
generation = {}, received generation = {}", ep, localGeneration, remoteGeneration);


Mime
View raw message