svn commit: r1149217 - /cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java

[sl...@apache.org]

Author: slebresne
Date: Thu Jul 21 15:14:36 2011
New Revision: 1149217

URL: http://svn.apache.org/viewvc?rev=1149217&view=rev
Log:
Reverting #2825 until BootStrapper unit test is fixed

Modified:
    cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java

Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java?rev=1149217&r1=1149216&r2=1149217&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java (original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java Thu Jul 21 15:14:36 2011
@@ -1726,8 +1726,6 @@ public class StorageService implements I
         List<DecoratedKey> keys = new ArrayList<DecoratedKey>();
         for (ColumnFamilyStore cfs : ColumnFamilyStore.all())
         {
-            if (cfs.table.name.equals(Table.SYSTEM_TABLE))
-                continue;
             for (DecoratedKey key : cfs.allKeySamples())
             {
                 if (range.contains(key.token))
@@ -1736,19 +1734,9 @@ public class StorageService implements I
         }
         FBUtilities.sortSampledKeys(keys, range);
 
-        Token token;
-        if (keys.size() < 3)
-        {
-            token = partitioner.midpoint(range.left, range.right);
-            logger_.debug("Used midpoint to assign token " + token);
-        }
-        else
-        {
-            token = keys.get(keys.size() / 2).token;
-            logger_.debug("Used key sample of size " + keys.size() + " to assign token " + token);
-        }
-        if (tokenMetadata_.isMember(tokenMetadata_.getEndpoint(token)))
-            throw new RuntimeException("Chose token " + token + " which is already in use by " + tokenMetadata_.getEndpoint(token) + " -- specify one manually with initial_token");
+        Token token = keys.size() < 3
+                    ? partitioner.midpoint(range.left, range.right)
+                    : keys.get(keys.size() / 2).token;
         // Hack to prevent giving nodes tokens with DELIMITER_STR in them (which is fine in a row key/token)
         if (token instanceof StringToken)
         {