cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject svn commit: r887369 - /incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
Date Fri, 04 Dec 2009 21:38:54 GMT
Author: jbellis
Date: Fri Dec  4 21:38:53 2009
New Revision: 887369

URL: http://svn.apache.org/viewvc?rev=887369&view=rev
Log:
simplify client mode gossip handling.  patch by Jaakko Laine; reviewed by jbellis

Modified:
    incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java?rev=887369&r1=887368&r2=887369&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java Fri
Dec  4 21:38:53 2009
@@ -417,16 +417,9 @@
             Token token = getPartitioner().getTokenFactory().fromString(state.getValue());
             if (logger_.isDebugEnabled())
                 logger_.debug(endpoint + " state normal, token " + token);
-            if (isClientMode)
-            {
-                tokenMetadata_.update(token, endpoint);
-                // do NOT update systemtable in client mode
-            }
-            else
-            {
-                tokenMetadata_.update(token, endpoint);
+            tokenMetadata_.update(token, endpoint);
+            if (!isClientMode)
                 SystemTable.updateToken(endpoint, token);
-            }
             replicationStrategy_.removeObsoletePendingRanges();
         }
         else if (STATE_LEAVING.equals(stateName))



Mime
View raw message