Author: jbellis
Date: Fri Jun 25 01:56:07 2010
New Revision: 957780
URL: http://svn.apache.org/viewvc?rev=957780&view=rev
Log:
use midpoint when bootstrapping a new machine into range with not much data
yet. patch by jbellis; reviewed by Stu Hood for CASSANDRA-1112
Modified:
cassandra/branches/cassandra-0.6/CHANGES.txt
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java
Modified: cassandra/branches/cassandra-0.6/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/CHANGES.txt?rev=957780&r1=957779&r2=957780&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.6/CHANGES.txt Fri Jun 25 01:56:07 2010
@@ -26,6 +26,8 @@
* allow removing entire row through batch_mutate Deletion (CASSANDRA-1027)
* add JMX metrics for row-level bloom filter false positives (CASSANDRA-1212)
* added a redhat init script to contrib (CASSANDRA-1201)
+ * use midpoint when bootstrapping a new machine into range with not
+ much data yet instead of random token (CASSANDRA-1112)
0.6.2
Modified:
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java?rev=957780&r1=957779&r2=957780&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java
(original)
+++
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java
Fri Jun 25 01:56:07 2010
@@ -1294,7 +1294,7 @@ public class StorageService implements I
FBUtilities.sortSampledKeys(keys, range);
if (keys.size() < 3)
- return partitioner_.getRandomToken();
+ return partitioner_.midpoint(range.left, range.right);
else
return keys.get(keys.size() / 2).token;
}
