You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2015/04/14 19:46:09 UTC
[1/4] cassandra git commit: Fix failed bootstrap/replace attempts
being persisted in system.peers
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 f59df2893 -> cba1b68db
refs/heads/trunk c74f22522 -> d6a4b4548
Fix failed bootstrap/replace attempts being persisted in system.peers
Patch by brandonwilliams, reviewed by slebresne for CASSANDRA-9180
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dcde8cac
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dcde8cac
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dcde8cac
Branch: refs/heads/trunk
Commit: dcde8cac0d6d96c342c6409a189edc372ddcb203
Parents: c74f225
Author: Brandon Williams <br...@apache.org>
Authored: Tue Apr 14 12:19:53 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Apr 14 12:44:13 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 5 +-
.../cassandra/service/StorageService.java | 63 ++++++++++----------
2 files changed, 34 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dcde8cac/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 063a39b..4a1cd1c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -94,12 +94,8 @@
* Save repair data to system table (CASSANDRA-5839)
2.1.5
-<<<<<<< HEAD
* Add generate-idea-files target to build.xml (CASSANDRA-9123)
-||||||| merged common ancestors
-=======
* Allow takeColumnFamilySnapshot to take a list of tables (CASSANDRA-8348)
->>>>>>> cassandra-2.1
* Limit major sstable operations to their canonical representation (CASSANDRA-8669)
* cqlsh: Add tests for INSERT and UPDATE tab completion (CASSANDRA-9125)
* cqlsh: quote column names when needed in COPY FROM inserts (CASSANDRA-9080)
@@ -171,6 +167,7 @@
* Use stdout for progress and stats in sstableloader (CASSANDRA-8982)
* Correctly identify 2i datadir from older versions (CASSANDRA-9116)
Merged from 2.0:
+ * Fix failed bootstrap/replace attempts being persisted in system.peers (CASSANDRA-9180)
* Flush system.IndexInfo after marking index built (CASSANDRA-9128)
* Fix updates to min/max_compaction_threshold through cassandra-cli
(CASSANDRA-8102)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dcde8cac/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 e0fb8b2..e07c0b1 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1612,37 +1612,40 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
return;
}
- switch (state)
+ if (getTokenMetadata().isMember(endpoint))
{
- case RELEASE_VERSION:
- SystemKeyspace.updatePeerInfo(endpoint, "release_version", value.value);
- break;
- case DC:
- SystemKeyspace.updatePeerInfo(endpoint, "data_center", value.value);
- break;
- case RACK:
- SystemKeyspace.updatePeerInfo(endpoint, "rack", value.value);
- break;
- case RPC_ADDRESS:
- try
- {
- SystemKeyspace.updatePeerInfo(endpoint, "rpc_address", InetAddress.getByName(value.value));
- }
- catch (UnknownHostException e)
- {
- throw new RuntimeException(e);
- }
- break;
- case SCHEMA:
- SystemKeyspace.updatePeerInfo(endpoint, "schema_version", UUID.fromString(value.value));
- MigrationManager.instance.scheduleSchemaPull(endpoint, epState);
- break;
- case HOST_ID:
- SystemKeyspace.updatePeerInfo(endpoint, "host_id", UUID.fromString(value.value));
- break;
- case RPC_READY:
- notifyRpcChange(endpoint, epState.isRpcReady());
- break;
+ switch (state)
+ {
+ case RELEASE_VERSION:
+ SystemKeyspace.updatePeerInfo(endpoint, "release_version", value.value);
+ break;
+ case DC:
+ SystemKeyspace.updatePeerInfo(endpoint, "data_center", value.value);
+ break;
+ case RACK:
+ SystemKeyspace.updatePeerInfo(endpoint, "rack", value.value);
+ break;
+ case RPC_ADDRESS:
+ try
+ {
+ SystemKeyspace.updatePeerInfo(endpoint, "rpc_address", InetAddress.getByName(value.value));
+ }
+ catch (UnknownHostException e)
+ {
+ throw new RuntimeException(e);
+ }
+ break;
+ case SCHEMA:
+ SystemKeyspace.updatePeerInfo(endpoint, "schema_version", UUID.fromString(value.value));
+ MigrationManager.instance.scheduleSchemaPull(endpoint, epState);
+ break;
+ case HOST_ID:
+ SystemKeyspace.updatePeerInfo(endpoint, "host_id", UUID.fromString(value.value));
+ break;
+ case RPC_READY:
+ notifyRpcChange(endpoint, epState.isRpcReady());
+ break;
+ }
}
}
}
[4/4] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d6a4b454
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d6a4b454
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d6a4b454
Branch: refs/heads/trunk
Commit: d6a4b4548f780b1f27177beda76a2c7a2b341412
Parents: dcde8ca cba1b68
Author: Brandon Williams <br...@apache.org>
Authored: Tue Apr 14 12:46:04 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Apr 14 12:46:04 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/4] cassandra git commit: Fix failed bootstrap/replace attempts
being persisted in system.peers
Posted by br...@apache.org.
Fix failed bootstrap/replace attempts being persisted in system.peers
Patch by brandonwilliams, reviewed by slebresne for CASSANDRA-9180
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cba1b68d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cba1b68d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cba1b68d
Branch: refs/heads/cassandra-2.1
Commit: cba1b68dbececb2aba500d56059e99bdab058b10
Parents: f59df28
Author: Brandon Williams <br...@apache.org>
Authored: Tue Apr 14 12:19:53 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Apr 14 12:45:23 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +
.../cassandra/service/StorageService.java | 57 ++++++++++----------
2 files changed, 32 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cba1b68d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d64ebc5..dfd5649 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -75,6 +75,8 @@
* Use stdout for progress and stats in sstableloader (CASSANDRA-8982)
* Correctly identify 2i datadir from older versions (CASSANDRA-9116)
Merged from 2.0:
+2.0.15:
+ * Fix failed bootstrap/replace attempts being persisted in system.peers (CASSANDRA-9180)
* Flush system.IndexInfo after marking index built (CASSANDRA-9128)
* Fix updates to min/max_compaction_threshold through cassandra-cli
(CASSANDRA-8102)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cba1b68d/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 a5fa563..c212d0d 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1479,34 +1479,37 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
return;
}
- switch (state)
+ if (getTokenMetadata().isMember(endpoint))
{
- case RELEASE_VERSION:
- SystemKeyspace.updatePeerInfo(endpoint, "release_version", value.value);
- break;
- case DC:
- SystemKeyspace.updatePeerInfo(endpoint, "data_center", value.value);
- break;
- case RACK:
- SystemKeyspace.updatePeerInfo(endpoint, "rack", value.value);
- break;
- case RPC_ADDRESS:
- try
- {
- SystemKeyspace.updatePeerInfo(endpoint, "rpc_address", InetAddress.getByName(value.value));
- }
- catch (UnknownHostException e)
- {
- throw new RuntimeException(e);
- }
- break;
- case SCHEMA:
- SystemKeyspace.updatePeerInfo(endpoint, "schema_version", UUID.fromString(value.value));
- MigrationManager.instance.scheduleSchemaPull(endpoint, epState);
- break;
- case HOST_ID:
- SystemKeyspace.updatePeerInfo(endpoint, "host_id", UUID.fromString(value.value));
- break;
+ switch (state)
+ {
+ case RELEASE_VERSION:
+ SystemKeyspace.updatePeerInfo(endpoint, "release_version", value.value);
+ break;
+ case DC:
+ SystemKeyspace.updatePeerInfo(endpoint, "data_center", value.value);
+ break;
+ case RACK:
+ SystemKeyspace.updatePeerInfo(endpoint, "rack", value.value);
+ break;
+ case RPC_ADDRESS:
+ try
+ {
+ SystemKeyspace.updatePeerInfo(endpoint, "rpc_address", InetAddress.getByName(value.value));
+ }
+ catch (UnknownHostException e)
+ {
+ throw new RuntimeException(e);
+ }
+ break;
+ case SCHEMA:
+ SystemKeyspace.updatePeerInfo(endpoint, "schema_version", UUID.fromString(value.value));
+ MigrationManager.instance.scheduleSchemaPull(endpoint, epState);
+ break;
+ case HOST_ID:
+ SystemKeyspace.updatePeerInfo(endpoint, "host_id", UUID.fromString(value.value));
+ break;
+ }
}
}
}
[2/4] cassandra git commit: Fix failed bootstrap/replace attempts
being persisted in system.peers
Posted by br...@apache.org.
Fix failed bootstrap/replace attempts being persisted in system.peers
Patch by brandonwilliams, reviewed by slebresne for CASSANDRA-9180
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cba1b68d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cba1b68d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cba1b68d
Branch: refs/heads/trunk
Commit: cba1b68dbececb2aba500d56059e99bdab058b10
Parents: f59df28
Author: Brandon Williams <br...@apache.org>
Authored: Tue Apr 14 12:19:53 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Apr 14 12:45:23 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +
.../cassandra/service/StorageService.java | 57 ++++++++++----------
2 files changed, 32 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cba1b68d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d64ebc5..dfd5649 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -75,6 +75,8 @@
* Use stdout for progress and stats in sstableloader (CASSANDRA-8982)
* Correctly identify 2i datadir from older versions (CASSANDRA-9116)
Merged from 2.0:
+2.0.15:
+ * Fix failed bootstrap/replace attempts being persisted in system.peers (CASSANDRA-9180)
* Flush system.IndexInfo after marking index built (CASSANDRA-9128)
* Fix updates to min/max_compaction_threshold through cassandra-cli
(CASSANDRA-8102)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cba1b68d/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 a5fa563..c212d0d 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1479,34 +1479,37 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
return;
}
- switch (state)
+ if (getTokenMetadata().isMember(endpoint))
{
- case RELEASE_VERSION:
- SystemKeyspace.updatePeerInfo(endpoint, "release_version", value.value);
- break;
- case DC:
- SystemKeyspace.updatePeerInfo(endpoint, "data_center", value.value);
- break;
- case RACK:
- SystemKeyspace.updatePeerInfo(endpoint, "rack", value.value);
- break;
- case RPC_ADDRESS:
- try
- {
- SystemKeyspace.updatePeerInfo(endpoint, "rpc_address", InetAddress.getByName(value.value));
- }
- catch (UnknownHostException e)
- {
- throw new RuntimeException(e);
- }
- break;
- case SCHEMA:
- SystemKeyspace.updatePeerInfo(endpoint, "schema_version", UUID.fromString(value.value));
- MigrationManager.instance.scheduleSchemaPull(endpoint, epState);
- break;
- case HOST_ID:
- SystemKeyspace.updatePeerInfo(endpoint, "host_id", UUID.fromString(value.value));
- break;
+ switch (state)
+ {
+ case RELEASE_VERSION:
+ SystemKeyspace.updatePeerInfo(endpoint, "release_version", value.value);
+ break;
+ case DC:
+ SystemKeyspace.updatePeerInfo(endpoint, "data_center", value.value);
+ break;
+ case RACK:
+ SystemKeyspace.updatePeerInfo(endpoint, "rack", value.value);
+ break;
+ case RPC_ADDRESS:
+ try
+ {
+ SystemKeyspace.updatePeerInfo(endpoint, "rpc_address", InetAddress.getByName(value.value));
+ }
+ catch (UnknownHostException e)
+ {
+ throw new RuntimeException(e);
+ }
+ break;
+ case SCHEMA:
+ SystemKeyspace.updatePeerInfo(endpoint, "schema_version", UUID.fromString(value.value));
+ MigrationManager.instance.scheduleSchemaPull(endpoint, epState);
+ break;
+ case HOST_ID:
+ SystemKeyspace.updatePeerInfo(endpoint, "host_id", UUID.fromString(value.value));
+ break;
+ }
}
}
}