cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject svn commit: r1028332 - in /cassandra/branches/cassandra-0.7: CHANGES.txt src/java/org/apache/cassandra/service/StorageService.java
Date Thu, 28 Oct 2010 14:46:58 GMT
Author: jbellis
Date: Thu Oct 28 14:46:58 2010
New Revision: 1028332

URL: http://svn.apache.org/viewvc?rev=1028332&view=rev
Log:
avoid logging when a node's ip/token is gossipped back to it.  patch by jbellis; reviewed
by gdusbabke for CASSANDRA-1666

Modified:
    cassandra/branches/cassandra-0.7/CHANGES.txt
    cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java

Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1028332&r1=1028331&r2=1028332&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Thu Oct 28 14:46:58 2010
@@ -1,4 +1,4 @@
-0.7.0-rc1
+0.7.0-beta3
  * add strategy options to describe_keyspace output (CASSANDRA-1560)
  * log warning when using randomly generated token (CASSANDRA-1552)
  * re-organize JMX into .db, .net, .internal, .request (CASSANDRA-1217)
@@ -61,6 +61,7 @@
  * renamed CL.DCQUORUM to LOCAL_QUORUM and DCQUORUMSYNC to EACH_QUORUM
  * cli truncate support (CASSANDRA-1653)
  * update GC settings in cassandra.bat (CASSANDRA-1636)
+ * avoid logging when a node's ip/token is gossipped back to it (CASSANDRA-1666)
 
 
 0.7-beta2

Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java?rev=1028332&r1=1028331&r2=1028332&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java
(original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java
Thu Oct 28 14:46:58 2010
@@ -670,6 +670,10 @@ public class StorageService implements I
             if (!isClientMode)
                 SystemTable.updateToken(endpoint, token);
         }
+        else if (endpoint.equals(currentNode))
+        {
+            // nothing to do
+        }
         else if (Gossiper.instance.compareEndpointStartup(endpoint, currentNode) > 0)
         {
             logger_.info(String.format("Nodes %s and %s have the same token %s.  %s is the
new owner",



Mime
View raw message