Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 15C9C9A84 for ; Mon, 13 Feb 2012 22:39:33 +0000 (UTC) Received: (qmail 53600 invoked by uid 500); 13 Feb 2012 22:39:32 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 53574 invoked by uid 500); 13 Feb 2012 22:39:32 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 53566 invoked by uid 99); 13 Feb 2012 22:39:32 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Feb 2012 22:39:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Feb 2012 22:39:29 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id ACCD931FAE4; Mon, 13 Feb 2012 22:39:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [4/12] git commit: fix unsynchronized use of TokenMetadata.entrySet patch by Peter Schuller; reviewed by jbellis for CASSANDRA-3417 Message-Id: <20120213223908.ACCD931FAE4@tyr.zones.apache.org> Date: Mon, 13 Feb 2012 22:39:08 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org fix unsynchronized use of TokenMetadata.entrySet patch by Peter Schuller; reviewed by jbellis for CASSANDRA-3417 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4ab6fad9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4ab6fad9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4ab6fad9 Branch: refs/heads/trunk Commit: 4ab6fad945cada90497a8cf523a4c868932834c2 Parents: 1047914 Author: Jonathan Ellis Authored: Mon Feb 13 15:31:43 2012 -0600 Committer: Jonathan Ellis Committed: Mon Feb 13 15:44:50 2012 -0600 ---------------------------------------------------------------------- .../cassandra/locator/NetworkTopologyStrategy.java | 2 +- .../apache/cassandra/locator/TokenMetadata.java | 28 +++++++++++---- .../apache/cassandra/service/StorageService.java | 4 +- 3 files changed, 24 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ab6fad9/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java b/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java index 2ae0a98..b6a99b2 100644 --- a/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java +++ b/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java @@ -88,7 +88,7 @@ public class NetworkTopologyStrategy extends AbstractReplicationStrategy // collect endpoints in this DC TokenMetadata dcTokens = new TokenMetadata(); - for (Entry tokenEntry : tokenMetadata.entrySet()) + for (Entry tokenEntry : tokenMetadata.getTokenToEndpointMapForReading().entrySet()) { if (snitch.getDatacenter(tokenEntry.getValue()).equals(dcName)) dcTokens.updateNormalToken(tokenEntry.getKey(), tokenEntry.getValue()); http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ab6fad9/src/java/org/apache/cassandra/locator/TokenMetadata.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/locator/TokenMetadata.java b/src/java/org/apache/cassandra/locator/TokenMetadata.java index ebb094b..0942a5d 100644 --- a/src/java/org/apache/cassandra/locator/TokenMetadata.java +++ b/src/java/org/apache/cassandra/locator/TokenMetadata.java @@ -408,11 +408,6 @@ public class TokenMetadata } } - public Set> entrySet() - { - return tokenToEndpointMap.entrySet(); - } - public InetAddress getEndpoint(Token token) { lock.readLock().lock(); @@ -713,9 +708,28 @@ public class TokenMetadata } /** - * Return the Token to Endpoint map for all the node in the cluster, including bootstrapping ones. + * @return a token to endpoint map to consider for read operations on the cluster. + */ + public Map getTokenToEndpointMapForReading() + { + lock.readLock().lock(); + try + { + Map map = new HashMap(tokenToEndpointMap.size()); + map.putAll(tokenToEndpointMap); + return map; + } + finally + { + lock.readLock().unlock(); + } + } + + /** + * @return a (stable copy, won't be modified) Token to Endpoint map for all the normal and bootstrapping nodes + * in the cluster. */ - public Map getTokenToEndpointMap() + public Map getNormalAndBootstrappingTokenToEndpointMap() { lock.readLock().lock(); try http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ab6fad9/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 1f7a18d..f82fe32 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -854,7 +854,7 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe public Map getTokenToEndpointMap() { - Map mapInetAddress = tokenMetadata_.getTokenToEndpointMap(); + Map mapInetAddress = tokenMetadata_.getNormalAndBootstrappingTokenToEndpointMap(); Map mapString = new HashMap(mapInetAddress.size()); for (Map.Entry entry : mapInetAddress.entrySet()) { @@ -2074,7 +2074,7 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe if (token instanceof StringToken) { token = new StringToken(((String)token.token).replaceAll(VersionedValue.DELIMITER_STR, "")); - if (tokenMetadata_.getTokenToEndpointMap().containsKey(token)) + if (tokenMetadata_.getNormalAndBootstrappingTokenToEndpointMap().containsKey(token)) throw new RuntimeException("Unable to compute unique token for new node -- specify one manually with initial_token"); } return token;