[1/5] git commit: Remove dead node from system.peers when replacing. Patch by brandonwilliams, reviewed by Jeremiah Jordan for CASSANDRA-6217

2013-10-18 Thread brandonwilliams 
Updated Branches:
  refs/heads/cassandra-2.0 718e3ec8b - ff5db5635
  refs/heads/trunk 3017dd34f - 8e0aa710d


Remove dead node from system.peers when replacing.
Patch by brandonwilliams, reviewed by Jeremiah Jordan for CASSANDRA-6217


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4a382ff4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4a382ff4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4a382ff4

Branch: refs/heads/cassandra-2.0
Commit: 4a382ff4565f6c85e36587683051257e1abb590d
Parents: 300f153
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Oct 18 11:11:24 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Oct 18 11:11:24 2013 -0500

--
 src/java/org/apache/cassandra/service/StorageService.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a382ff4/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 d2c69d0..11393c6 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -965,6 +965,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 {
 // Dont set any state for the node which is bootstrapping the 
existing token...
 tokenMetadata.updateNormalTokens(tokens, 
FBUtilities.getBroadcastAddress());
+SystemTable.removeEndpoint(DatabaseDescriptor.getReplaceAddress());
 }
 Tracing.instance();
 if (!Gossiper.instance.seenAnySeed())

git commit: Remove dead node from system.peers when replacing. Patch by brandonwilliams, reviewed by Jeremiah Jordan for CASSANDRA-6217

2013-10-18 Thread brandonwilliams 
Updated Branches:
  refs/heads/cassandra-1.2 942444971 - 558483dd2


Remove dead node from system.peers when replacing.
Patch by brandonwilliams, reviewed by Jeremiah Jordan for CASSANDRA-6217


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/558483dd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/558483dd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/558483dd

Branch: refs/heads/cassandra-1.2
Commit: 558483dd20439d1bc74dec6ebed0b4632ef5a1ca
Parents: 9424449
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Oct 18 11:11:24 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Oct 18 11:12:31 2013 -0500

--
 src/java/org/apache/cassandra/service/StorageService.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/558483dd/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 d2c69d0..11393c6 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -965,6 +965,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 {
 // Dont set any state for the node which is bootstrapping the 
existing token...
 tokenMetadata.updateNormalTokens(tokens, 
FBUtilities.getBroadcastAddress());
+SystemTable.removeEndpoint(DatabaseDescriptor.getReplaceAddress());
 }
 Tracing.instance();
 if (!Gossiper.instance.seenAnySeed())

[2/5] git commit: Remove dead node from system.peers when replacing. Patch by brandonwilliams, reviewed by Jeremiah Jordan for CASSANDRA-6217

2013-10-18 Thread brandonwilliams 
Remove dead node from system.peers when replacing.
Patch by brandonwilliams, reviewed by Jeremiah Jordan for CASSANDRA-6217


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4a382ff4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4a382ff4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4a382ff4

Branch: refs/heads/trunk
Commit: 4a382ff4565f6c85e36587683051257e1abb590d
Parents: 300f153
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Oct 18 11:11:24 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Oct 18 11:11:24 2013 -0500

--
 src/java/org/apache/cassandra/service/StorageService.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a382ff4/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 d2c69d0..11393c6 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -965,6 +965,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 {
 // Dont set any state for the node which is bootstrapping the 
existing token...
 tokenMetadata.updateNormalTokens(tokens, 
FBUtilities.getBroadcastAddress());
+SystemTable.removeEndpoint(DatabaseDescriptor.getReplaceAddress());
 }
 Tracing.instance();
 if (!Gossiper.instance.seenAnySeed())

[2/5] git commit: Remove dead node from system.peers when replacing. Patch by brandonwilliams, reviewed by Jeremiah Jordan for CASSANDRA-6217

2013-10-18 Thread dbrosius 
Remove dead node from system.peers when replacing.
Patch by brandonwilliams, reviewed by Jeremiah Jordan for CASSANDRA-6217


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/558483dd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/558483dd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/558483dd

Branch: refs/heads/trunk
Commit: 558483dd20439d1bc74dec6ebed0b4632ef5a1ca
Parents: 9424449
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Oct 18 11:11:24 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Oct 18 11:12:31 2013 -0500

--
 src/java/org/apache/cassandra/service/StorageService.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/558483dd/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 d2c69d0..11393c6 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -965,6 +965,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 {
 // Dont set any state for the node which is bootstrapping the 
existing token...
 tokenMetadata.updateNormalTokens(tokens, 
FBUtilities.getBroadcastAddress());
+SystemTable.removeEndpoint(DatabaseDescriptor.getReplaceAddress());
 }
 Tracing.instance();
 if (!Gossiper.instance.seenAnySeed())

[2/4] git commit: Remove dead node from system.peers when replacing. Patch by brandonwilliams, reviewed by Jeremiah Jordan for CASSANDRA-6217

2013-10-18 Thread dbrosius 
Remove dead node from system.peers when replacing.
Patch by brandonwilliams, reviewed by Jeremiah Jordan for CASSANDRA-6217


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/558483dd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/558483dd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/558483dd

Branch: refs/heads/cassandra-2.0
Commit: 558483dd20439d1bc74dec6ebed0b4632ef5a1ca
Parents: 9424449
Author: Brandon Williams brandonwilli...@apache.org
Authored: Fri Oct 18 11:11:24 2013 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Fri Oct 18 11:12:31 2013 -0500

--
 src/java/org/apache/cassandra/service/StorageService.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/558483dd/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 d2c69d0..11393c6 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -965,6 +965,7 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
 {
 // Dont set any state for the node which is bootstrapping the 
existing token...
 tokenMetadata.updateNormalTokens(tokens, 
FBUtilities.getBroadcastAddress());
+SystemTable.removeEndpoint(DatabaseDescriptor.getReplaceAddress());
 }
 Tracing.instance();
 if (!Gossiper.instance.seenAnySeed())