You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/10/21 04:17:04 UTC
git commit: remove dead 'load' parm to getBootstrapTokens
Updated Branches:
refs/heads/cassandra-2.0 72f47a4e5 -> d00a2336b
remove dead 'load' parm to getBootstrapTokens
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d00a2336
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d00a2336
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d00a2336
Branch: refs/heads/cassandra-2.0
Commit: d00a2336b7163ad8b4a0c0f4a848ad79c3652903
Parents: 72f47a4
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sun Oct 20 22:16:38 2013 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sun Oct 20 22:16:38 2013 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/dht/BootStrapper.java | 2 +-
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d00a2336/src/java/org/apache/cassandra/dht/BootStrapper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/BootStrapper.java b/src/java/org/apache/cassandra/dht/BootStrapper.java
index 57d8d94..0c22c23 100644
--- a/src/java/org/apache/cassandra/dht/BootStrapper.java
+++ b/src/java/org/apache/cassandra/dht/BootStrapper.java
@@ -92,7 +92,7 @@ public class BootStrapper
* otherwise, if num_tokens == 1, pick a token to assume half the load of the most-loaded node.
* else choose num_tokens tokens at random
*/
- public static Collection<Token> getBootstrapTokens(final TokenMetadata metadata, Map<InetAddress, Double> load) throws ConfigurationException
+ public static Collection<Token> getBootstrapTokens(final TokenMetadata metadata) throws ConfigurationException
{
Collection<String> initialTokens = DatabaseDescriptor.getInitialTokens();
// if user specified tokens, use those
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d00a2336/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index e45fb71..f171192 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -662,7 +662,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
throw new UnsupportedOperationException(s);
}
setMode(Mode.JOINING, "getting bootstrap token", true);
- tokens = BootStrapper.getBootstrapTokens(tokenMetadata, LoadBroadcaster.instance.getLoadInfo());
+ tokens = BootStrapper.getBootstrapTokens(tokenMetadata);
}
else
{