@@ -137,7 +137,8 @@ public class BootStrapper implements Runnable if (logger_.isDebugEnabled()) logger_.debug("Total number of new ranges " + newRanges.length); /* Calculate the list of nodes that handle the new ranges */ - Map<Range, List<EndPoint>> newRangeToEndPointMap = StorageService.instance().constructRangeToEndPointMap(newRanges); + Map<Range, List<EndPoint>> newRangeToEndPointMap = + StorageService.instance().constructRangeToEndPointMap(newRanges, tokenMetadata_.cloneTokenEndPointMapIncludingBootstrapNodes()); /* Calculate ranges that need to be sent and from whom to where */ Map<Range, List<BootstrapSourceTarget>> rangesWithSourceTarget = LeaveJoinProtocolHelper.getRangeSourceTargetInfo(oldRangeToEndPointMap, newRangeToEndPointMap); return rangesWithSourceTarget; src/java/org/apache/cassandra/dht/BootStrapper.java @@ -213,6 +213,24 @@ public class TokenMetadata } } + public Map<Token, EndPoint> cloneTokenEndPointMapIncludingBootstrapNodes() + { + lock_.readLock().lock(); + try + { + Map h1 = new HashMap<Token, EndPoint>( tokenToEndPointMap_ ); + for (Map.Entry<Token, EndPoint> e: bootstrapNodes.entrySet()) + { + h1.put(e.getKey(), e.getValue()); + } + return h1; + } + finally + { + lock_.readLock().unlock(); + } + } + /* * Returns a safe clone of endPointTokenMap_. */ src/java/org/apache/cassandra/locator/TokenMetadata.java @@ -301,7 +301,7 @@ public final class StorageService implements IEndPointStateChangeSubscriber, Sto if (isBootstrapMode) { logger_.info("Starting in bootstrap mode"); - doBootstrap(StorageService.getLocalStorageEndPoint()); + bootStrapper_.submit(new BootStrapper(new EndPoint[]{StorageService.getLocalStorageEndPoint()}, storageMetadata_.getToken())); Gossiper.instance().addApplicationState(BOOTSTRAP_MODE, new ApplicationState("")); } } @@ -317,9 +317,9 @@ public final class StorageService implements IEndPointStateChangeSubscriber, Sto } /* TODO: used for testing */ - public void updateTokenMetadata(Token token, EndPoint endpoint) + public void updateTokenMetadata(Token token, EndPoint endpoint, boolean bs) { - tokenMetadata_.update(token, endpoint); + tokenMetadata_.update(token, endpoint, bs); } public IEndPointSnitch getEndPointSnitch() @@ -593,9 +593,8 @@ public final class StorageService implements IEndPointStateChangeSubscriber, Sto * Starts the bootstrap operations for the specified endpoint. * @param endpoint */ - public final void doBootstrap(EndPoint endpoint) + public final void doBootstrap(EndPoint endpoint, Token token) { - Token token = tokenMetadata_.getToken(endpoint); bootStrapper_.submit(new BootStrapper(new EndPoint[]{endpoint}, token)); } src/java/org/apache/cassandra/service/StorageService.java @@ -41,7 +41,7 @@ public class BootStrapperTest { /* New token needs to be part of the map for the algorithm * to calculate the ranges correctly */ - StorageService.instance().updateTokenMetadata(newToken, newEndPoint); + StorageService.instance().updateTokenMetadata(newToken, newEndPoint, true); BootStrapper b = new BootStrapper(new EndPoint[]{newEndPoint}, newToken ); Map<Range,List<BootstrapSourceTarget>> res = b.getRangesWithSourceTarget(); @@ -74,7 +74,7 @@ public class BootStrapperTest { { EndPoint e = new EndPoint("127.0.0."+i, 100); Token t = p.getDefaultToken(); - StorageService.instance().updateTokenMetadata(t, e); + StorageService.instance().updateTokenMetadata(t, e, false); } return p; } test/unit/org/apache/cassandra/dht/BootStrapperTest.java 390ca5a248cc960855e748b48d7f2fc2903faa5f Jonathan Ellis jbellis@apache.org http://github.com/ryanking/cassandra/commit/037a04bdc764e9424ec1600d5116bf726e03e9d8 037a04bdc764e9424ec1600d5116bf726e03e9d8 2009-11-03T12:03:32-08:00 2009-11-03T12:03:32-08:00 Fixes null token getting passed to Bootstapper; Correctly includes new nodes in src-target calculation. patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-501 git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.4@832531 13f79535-47bb-0310-9956-ffa450edef68 68dad27e8d47635967944a090b56d79b80fbad64 Jonathan Ellis jbellis@apache.org