You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/09/30 20:53:59 UTC
[3/9] git commit: lock access to TM.endpointToHostIdMap patch by
Mikhail Stepura; reviewed by jbellis for CASSANDRA-6103
lock access to TM.endpointToHostIdMap
patch by Mikhail Stepura; reviewed by jbellis for CASSANDRA-6103
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d73380e3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d73380e3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d73380e3
Branch: refs/heads/trunk
Commit: d73380e319c663d5bff23a7730dcf97cbd323970
Parents: 898ce5f
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Sep 30 13:49:15 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Sep 30 13:51:55 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/locator/TokenMetadata.java | 97 ++++++++++++++++----
2 files changed, 78 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d73380e3/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ca559b1..6a695e1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.11
+ * lock access to TM.endpointToHostIdMap (CASSANDRA-6103)
* Allow estimated memtable size to exceed slab allocator size (CASSANDRA-6078)
* Start MeteredFlusher earlier to prevent OOM during CL replay (CASSANDRA-6087)
* Avoid sending Truncate command to fat clients (CASSANDRA-6088)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d73380e3/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 1f6682b..7ad711f 100644
--- a/src/java/org/apache/cassandra/locator/TokenMetadata.java
+++ b/src/java/org/apache/cassandra/locator/TokenMetadata.java
@@ -221,43 +221,76 @@ public class TokenMetadata
assert hostId != null;
assert endpoint != null;
- InetAddress storedEp = endpointToHostIdMap.inverse().get(hostId);
- if (storedEp != null)
+ lock.writeLock().lock();
+ try
{
- if (!storedEp.equals(endpoint) && (FailureDetector.instance.isAlive(storedEp)))
+ InetAddress storedEp = endpointToHostIdMap.inverse().get(hostId);
+ if (storedEp != null)
{
- throw new RuntimeException(String.format("Host ID collision between active endpoint %s and %s (id=%s)",
- storedEp,
- endpoint,
- hostId));
+ if (!storedEp.equals(endpoint) && (FailureDetector.instance.isAlive(storedEp)))
+ {
+ throw new RuntimeException(String.format("Host ID collision between active endpoint %s and %s (id=%s)",
+ storedEp,
+ endpoint,
+ hostId));
+ }
}
+
+ UUID storedId = endpointToHostIdMap.get(endpoint);
+ if ((storedId != null) && (!storedId.equals(hostId)))
+ logger.warn("Changing {}'s host ID from {} to {}", new Object[] {endpoint, storedId, hostId});
+
+ endpointToHostIdMap.forcePut(endpoint, hostId);
+ }
+ finally
+ {
+ lock.writeLock().unlock();
}
- UUID storedId = endpointToHostIdMap.get(endpoint);
- if ((storedId != null) && (!storedId.equals(hostId)))
- logger.warn("Changing {}'s host ID from {} to {}", new Object[] {endpoint, storedId, hostId});
-
- endpointToHostIdMap.forcePut(endpoint, hostId);
}
/** Return the unique host ID for an end-point. */
public UUID getHostId(InetAddress endpoint)
{
- return endpointToHostIdMap.get(endpoint);
+ lock.readLock().lock();
+ try
+ {
+ return endpointToHostIdMap.get(endpoint);
+ }
+ finally
+ {
+ lock.readLock().unlock();
+ }
}
/** Return the end-point for a unique host ID */
public InetAddress getEndpointForHostId(UUID hostId)
{
- return endpointToHostIdMap.inverse().get(hostId);
+ lock.readLock().lock();
+ try
+ {
+ return endpointToHostIdMap.inverse().get(hostId);
+ }
+ finally
+ {
+ lock.readLock().unlock();
+ }
}
/** @return a copy of the endpoint-to-id map for read-only operations */
public Map<InetAddress, UUID> getEndpointToHostIdMapForReading()
{
- Map<InetAddress, UUID> readMap = new HashMap<InetAddress, UUID>();
- readMap.putAll(endpointToHostIdMap);
- return readMap;
+ lock.readLock().lock();
+ try
+ {
+ Map<InetAddress, UUID> readMap = new HashMap<InetAddress, UUID>();
+ readMap.putAll(endpointToHostIdMap);
+ return readMap;
+ }
+ finally
+ {
+ lock.readLock().unlock();
+ }
}
@Deprecated
@@ -725,13 +758,29 @@ public class TokenMetadata
public Set<InetAddress> getAllEndpoints()
{
- return endpointToHostIdMap.keySet();
+ lock.readLock().lock();
+ try
+ {
+ return new HashSet<>(endpointToHostIdMap.keySet());
+ }
+ finally
+ {
+ lock.readLock().unlock();
+ }
}
/** caller should not modify leavingEndpoints */
public Set<InetAddress> getLeavingEndpoints()
{
- return leavingEndpoints;
+ lock.readLock().lock();
+ try
+ {
+ return new HashSet<>(leavingEndpoints);
+ }
+ finally
+ {
+ lock.readLock().unlock();
+ }
}
/**
@@ -740,7 +789,15 @@ public class TokenMetadata
*/
public Set<Pair<Token, InetAddress>> getMovingEndpoints()
{
- return movingEndpoints;
+ lock.readLock().lock();
+ try
+ {
+ return new HashSet<>(movingEndpoints);
+ }
+ finally
+ {
+ lock.readLock().unlock();
+ }
}
/**