You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2013/06/19 21:23:23 UTC
[1/4] git commit: Gossiper.addSavedEndpoint() drops any info
previously known about a node.
Updated Branches:
refs/heads/trunk 86081fa78 -> 78b0dbeb2
Gossiper.addSavedEndpoint() drops any info previously known about a node.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/00126da7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/00126da7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/00126da7
Branch: refs/heads/trunk
Commit: 00126da7b59cd1083e8a345acd7ba99b7d9fd40e
Parents: b1d7405
Author: Jason Brown <ja...@gmail.com>
Authored: Wed Jun 19 05:49:54 2013 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Wed Jun 19 05:49:54 2013 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/00126da7/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index 79a64fb..efa9865 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -1074,7 +1074,19 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
logger.debug("Attempt to add self as saved endpoint");
return;
}
- EndpointState epState = new EndpointState(new HeartBeatState(0));
+
+ //preserve any previously known, in-memory data about the endpoint (such as DC, RACK, and so on)
+ EndpointState epState = endpointStateMap.get(ep);
+ if (epState != null)
+ {
+ logger.debug("not replacing a previous epState for {}, but reusing it: {}", ep, epState);
+ epState.setHeartBeatState(new HeartBeatState(0));
+ }
+ else
+ {
+ epState = new EndpointState(new HeartBeatState(0));
+ }
+
epState.markDead();
endpointStateMap.put(ep, epState);
unreachableEndpoints.put(ep, System.currentTimeMillis());
[2/4] git commit: make TokenMetadata.relocatingTokens a ConcurrentMap
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-5634
Posted by ja...@apache.org.
make TokenMetadata.relocatingTokens a ConcurrentMap
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-5634
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5b525c1f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b525c1f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b525c1f
Branch: refs/heads/trunk
Commit: 5b525c1fc3cca4ae8884593b83c89546d317cd49
Parents: 42be16f
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Jun 19 13:55:40 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Jun 19 13:56:01 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/locator/TokenMetadata.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b525c1f/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 925a811..1f6682b 100644
--- a/src/java/org/apache/cassandra/locator/TokenMetadata.java
+++ b/src/java/org/apache/cassandra/locator/TokenMetadata.java
@@ -85,7 +85,7 @@ public class TokenMetadata
private final Set<Pair<Token, InetAddress>> movingEndpoints = new HashSet<Pair<Token, InetAddress>>();
// tokens which are migrating to new endpoints
- private final Map<Token, InetAddress> relocatingTokens = new HashMap<Token, InetAddress>();
+ private final ConcurrentMap<Token, InetAddress> relocatingTokens = new ConcurrentHashMap<Token, InetAddress>();
/* Use this lock for manipulating the token map */
private final ReadWriteLock lock = new ReentrantReadWriteLock(true);
[4/4] git commit: Merge branch 'cassandra-1.2' into trunk
Posted by ja...@apache.org.
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/78b0dbeb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/78b0dbeb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/78b0dbeb
Branch: refs/heads/trunk
Commit: 78b0dbeb25f2327fc2c417bb07bebac15f99e785
Parents: 86081fa fc5044f
Author: Jason Brown <ja...@gmail.com>
Authored: Wed Jun 19 12:21:52 2013 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Wed Jun 19 12:21:52 2013 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/78b0dbeb/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/gms/Gossiper.java
index c32cc41,efa9865..d8918f3
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@@ -1077,10 -1074,22 +1077,22 @@@ public class Gossiper implements IFailu
logger.debug("Attempt to add self as saved endpoint");
return;
}
- EndpointState epState = new EndpointState(new HeartBeatState(0));
+
+ //preserve any previously known, in-memory data about the endpoint (such as DC, RACK, and so on)
+ EndpointState epState = endpointStateMap.get(ep);
+ if (epState != null)
+ {
+ logger.debug("not replacing a previous epState for {}, but reusing it: {}", ep, epState);
+ epState.setHeartBeatState(new HeartBeatState(0));
+ }
+ else
+ {
+ epState = new EndpointState(new HeartBeatState(0));
+ }
+
epState.markDead();
endpointStateMap.put(ep, epState);
- unreachableEndpoints.put(ep, System.currentTimeMillis());
+ unreachableEndpoints.put(ep, System.nanoTime());
if (logger.isTraceEnabled())
logger.trace("Adding saved endpoint " + ep + " " + epState.getHeartBeatState().getGeneration());
}
[3/4] git commit: Gossiper incorrectly drops AppState for an
upgrading node patch by jasobrown; reviewed by driftx for CASSANDRA-5660
Posted by ja...@apache.org.
Gossiper incorrectly drops AppState for an upgrading node
patch by jasobrown; reviewed by driftx for CASSANDRA-5660
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fc5044f5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc5044f5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc5044f5
Branch: refs/heads/trunk
Commit: fc5044f591b3728a7c01c44c3b953f798c475cee
Parents: 5b525c1 00126da
Author: Jason Brown <ja...@gmail.com>
Authored: Wed Jun 19 12:20:39 2013 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Wed Jun 19 12:20:39 2013 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/gms/Gossiper.java | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------