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 2014/05/06 23:17:09 UTC
[01/13] git commit: Update peer information when a node jumps to
normal.
Repository: cassandra
Updated Branches:
refs/heads/cassandra-1.2 64394b252 -> f4460a55b
refs/heads/cassandra-2.0 8d93c1fcb -> 0a09edc81
refs/heads/cassandra-2.1 60faac434 -> 4f57aa056
refs/heads/trunk 07dcc9973 -> 3876ad51b
Update peer information when a node jumps to normal.
Patch by brandonwilliams, reviewed by Richard Low for CASSANDRA-7122
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f4460a55
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f4460a55
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f4460a55
Branch: refs/heads/cassandra-1.2
Commit: f4460a55b85759d2a631a2d931f10106e1748770
Parents: 64394b2
Author: Brandon Williams <br...@apache.org>
Authored: Tue May 6 16:10:10 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue May 6 16:10:10 2014 -0500
----------------------------------------------------------------------
.../cassandra/service/StorageService.java | 30 ++++++++++++++++++++
1 file changed, 30 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4460a55/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 bfca642..ed6d031 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1383,6 +1383,35 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
}
}
+ private void updatePeerInfo(InetAddress endpoint)
+ {
+ EndpointState epState = Gossiper.instance.getEndpointStateForEndpoint(endpoint);
+ for (Map.Entry<ApplicationState, VersionedValue> entry : epState.getApplicationStateMap().entrySet())
+ {
+ switch (entry.getKey())
+ {
+ case RELEASE_VERSION:
+ SystemTable.updatePeerInfo(endpoint, "release_version", quote(entry.getValue().value));
+ break;
+ case DC:
+ SystemTable.updatePeerInfo(endpoint, "data_center", quote(entry.getValue().value));
+ break;
+ case RACK:
+ SystemTable.updatePeerInfo(endpoint, "rack", quote(entry.getValue().value));
+ break;
+ case RPC_ADDRESS:
+ SystemTable.updatePeerInfo(endpoint, "rpc_address", quote(entry.getValue().value));
+ break;
+ case SCHEMA:
+ SystemTable.updatePeerInfo(endpoint, "schema_version", entry.getValue().value);
+ break;
+ case HOST_ID:
+ SystemTable.updatePeerInfo(endpoint, "host_id", entry.getValue().value);
+ break;
+ }
+ }
+ }
+
private String quote(String value)
{
return "'" + value + "'";
@@ -1484,6 +1513,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
if (tokenMetadata.isMember(endpoint))
logger.info("Node " + endpoint + " state jump to normal");
+ updatePeerInfo(endpoint);
// Order Matters, TM.updateHostID() should be called before TM.updateNormalToken(), (see CASSANDRA-4300).
if (Gossiper.instance.usesHostId(endpoint))
{
[11/13] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f57aa05
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f57aa05
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f57aa05
Branch: refs/heads/cassandra-2.1
Commit: 4f57aa0563f76467f5d94b460fc73e805327bde3
Parents: 60faac4 0a09edc
Author: Brandon Williams <br...@apache.org>
Authored: Tue May 6 16:13:09 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue May 6 16:13:09 2014 -0500
----------------------------------------------------------------------
.../cassandra/service/StorageService.java | 30 ++++++++++++++++++++
1 file changed, 30 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f57aa05/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index f1be0c2,0300f55..13d9fda
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -1529,11 -1550,12 +1558,12 @@@ public class StorageService extends Not
if (logger.isDebugEnabled())
- logger.debug("Node " + endpoint + " state normal, token " + tokens);
+ logger.debug("Node {} state normal, token {}", endpoint, tokens);
if (tokenMetadata.isMember(endpoint))
- logger.info("Node " + endpoint + " state jump to normal");
+ logger.info("Node {} state jump to normal", endpoint);
+ updatePeerInfo(endpoint);
// Order Matters, TM.updateHostID() should be called before TM.updateNormalToken(), (see CASSANDRA-4300).
if (Gossiper.instance.usesHostId(endpoint))
{
[12/13] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f57aa05
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f57aa05
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f57aa05
Branch: refs/heads/trunk
Commit: 4f57aa0563f76467f5d94b460fc73e805327bde3
Parents: 60faac4 0a09edc
Author: Brandon Williams <br...@apache.org>
Authored: Tue May 6 16:13:09 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue May 6 16:13:09 2014 -0500
----------------------------------------------------------------------
.../cassandra/service/StorageService.java | 30 ++++++++++++++++++++
1 file changed, 30 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f57aa05/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index f1be0c2,0300f55..13d9fda
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -1529,11 -1550,12 +1558,12 @@@ public class StorageService extends Not
if (logger.isDebugEnabled())
- logger.debug("Node " + endpoint + " state normal, token " + tokens);
+ logger.debug("Node {} state normal, token {}", endpoint, tokens);
if (tokenMetadata.isMember(endpoint))
- logger.info("Node " + endpoint + " state jump to normal");
+ logger.info("Node {} state jump to normal", endpoint);
+ updatePeerInfo(endpoint);
// Order Matters, TM.updateHostID() should be called before TM.updateNormalToken(), (see CASSANDRA-4300).
if (Gossiper.instance.usesHostId(endpoint))
{
[06/13] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b17629ca
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b17629ca
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b17629ca
Branch: refs/heads/trunk
Commit: b17629cafcf17487971eba80f1443c00ad4e25ea
Parents: 8d93c1f f4460a5
Author: Brandon Williams <br...@apache.org>
Authored: Tue May 6 16:10:52 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue May 6 16:10:52 2014 -0500
----------------------------------------------------------------------
.../cassandra/service/StorageService.java | 30 ++++++++++++++++++++
1 file changed, 30 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b17629ca/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[04/13] git commit: Update peer information when a node jumps to
normal.
Posted by br...@apache.org.
Update peer information when a node jumps to normal.
Patch by brandonwilliams, reviewed by Richard Low for CASSANDRA-7122
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f4460a55
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f4460a55
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f4460a55
Branch: refs/heads/cassandra-2.1
Commit: f4460a55b85759d2a631a2d931f10106e1748770
Parents: 64394b2
Author: Brandon Williams <br...@apache.org>
Authored: Tue May 6 16:10:10 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue May 6 16:10:10 2014 -0500
----------------------------------------------------------------------
.../cassandra/service/StorageService.java | 30 ++++++++++++++++++++
1 file changed, 30 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4460a55/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 bfca642..ed6d031 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1383,6 +1383,35 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
}
}
+ private void updatePeerInfo(InetAddress endpoint)
+ {
+ EndpointState epState = Gossiper.instance.getEndpointStateForEndpoint(endpoint);
+ for (Map.Entry<ApplicationState, VersionedValue> entry : epState.getApplicationStateMap().entrySet())
+ {
+ switch (entry.getKey())
+ {
+ case RELEASE_VERSION:
+ SystemTable.updatePeerInfo(endpoint, "release_version", quote(entry.getValue().value));
+ break;
+ case DC:
+ SystemTable.updatePeerInfo(endpoint, "data_center", quote(entry.getValue().value));
+ break;
+ case RACK:
+ SystemTable.updatePeerInfo(endpoint, "rack", quote(entry.getValue().value));
+ break;
+ case RPC_ADDRESS:
+ SystemTable.updatePeerInfo(endpoint, "rpc_address", quote(entry.getValue().value));
+ break;
+ case SCHEMA:
+ SystemTable.updatePeerInfo(endpoint, "schema_version", entry.getValue().value);
+ break;
+ case HOST_ID:
+ SystemTable.updatePeerInfo(endpoint, "host_id", entry.getValue().value);
+ break;
+ }
+ }
+ }
+
private String quote(String value)
{
return "'" + value + "'";
@@ -1484,6 +1513,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
if (tokenMetadata.isMember(endpoint))
logger.info("Node " + endpoint + " state jump to normal");
+ updatePeerInfo(endpoint);
// Order Matters, TM.updateHostID() should be called before TM.updateNormalToken(), (see CASSANDRA-4300).
if (Gossiper.instance.usesHostId(endpoint))
{
[05/13] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b17629ca
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b17629ca
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b17629ca
Branch: refs/heads/cassandra-2.1
Commit: b17629cafcf17487971eba80f1443c00ad4e25ea
Parents: 8d93c1f f4460a5
Author: Brandon Williams <br...@apache.org>
Authored: Tue May 6 16:10:52 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue May 6 16:10:52 2014 -0500
----------------------------------------------------------------------
.../cassandra/service/StorageService.java | 30 ++++++++++++++++++++
1 file changed, 30 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b17629ca/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[13/13] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3876ad51
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3876ad51
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3876ad51
Branch: refs/heads/trunk
Commit: 3876ad51b3a70ccc6226b0cf3ba12f368bc2b045
Parents: 07dcc99 4f57aa0
Author: Brandon Williams <br...@apache.org>
Authored: Tue May 6 16:13:18 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue May 6 16:13:18 2014 -0500
----------------------------------------------------------------------
.../cassandra/service/StorageService.java | 30 ++++++++++++++++++++
1 file changed, 30 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3876ad51/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[09/13] git commit: merge
Posted by br...@apache.org.
merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0a09edc8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0a09edc8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0a09edc8
Branch: refs/heads/trunk
Commit: 0a09edc8180d4b0dae8c56dd64a1b1c531d684f8
Parents: b17629c
Author: Brandon Williams <br...@apache.org>
Authored: Tue May 6 16:12:58 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue May 6 16:12:58 2014 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/service/StorageService.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0a09edc8/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 38f1a99..0300f55 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1433,22 +1433,22 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
switch (entry.getKey())
{
case RELEASE_VERSION:
- SystemTable.updatePeerInfo(endpoint, "release_version", quote(entry.getValue().value));
+ SystemKeyspace.updatePeerInfo(endpoint, "release_version", quote(entry.getValue().value));
break;
case DC:
- SystemTable.updatePeerInfo(endpoint, "data_center", quote(entry.getValue().value));
+ SystemKeyspace.updatePeerInfo(endpoint, "data_center", quote(entry.getValue().value));
break;
case RACK:
- SystemTable.updatePeerInfo(endpoint, "rack", quote(entry.getValue().value));
+ SystemKeyspace.updatePeerInfo(endpoint, "rack", quote(entry.getValue().value));
break;
case RPC_ADDRESS:
- SystemTable.updatePeerInfo(endpoint, "rpc_address", quote(entry.getValue().value));
+ SystemKeyspace.updatePeerInfo(endpoint, "rpc_address", quote(entry.getValue().value));
break;
case SCHEMA:
- SystemTable.updatePeerInfo(endpoint, "schema_version", entry.getValue().value);
+ SystemKeyspace.updatePeerInfo(endpoint, "schema_version", entry.getValue().value);
break;
case HOST_ID:
- SystemTable.updatePeerInfo(endpoint, "host_id", entry.getValue().value);
+ SystemKeyspace.updatePeerInfo(endpoint, "host_id", entry.getValue().value);
break;
}
}
[07/13] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b17629ca
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b17629ca
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b17629ca
Branch: refs/heads/cassandra-2.0
Commit: b17629cafcf17487971eba80f1443c00ad4e25ea
Parents: 8d93c1f f4460a5
Author: Brandon Williams <br...@apache.org>
Authored: Tue May 6 16:10:52 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue May 6 16:10:52 2014 -0500
----------------------------------------------------------------------
.../cassandra/service/StorageService.java | 30 ++++++++++++++++++++
1 file changed, 30 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b17629ca/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[08/13] git commit: merge
Posted by br...@apache.org.
merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0a09edc8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0a09edc8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0a09edc8
Branch: refs/heads/cassandra-2.1
Commit: 0a09edc8180d4b0dae8c56dd64a1b1c531d684f8
Parents: b17629c
Author: Brandon Williams <br...@apache.org>
Authored: Tue May 6 16:12:58 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue May 6 16:12:58 2014 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/service/StorageService.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0a09edc8/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 38f1a99..0300f55 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1433,22 +1433,22 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
switch (entry.getKey())
{
case RELEASE_VERSION:
- SystemTable.updatePeerInfo(endpoint, "release_version", quote(entry.getValue().value));
+ SystemKeyspace.updatePeerInfo(endpoint, "release_version", quote(entry.getValue().value));
break;
case DC:
- SystemTable.updatePeerInfo(endpoint, "data_center", quote(entry.getValue().value));
+ SystemKeyspace.updatePeerInfo(endpoint, "data_center", quote(entry.getValue().value));
break;
case RACK:
- SystemTable.updatePeerInfo(endpoint, "rack", quote(entry.getValue().value));
+ SystemKeyspace.updatePeerInfo(endpoint, "rack", quote(entry.getValue().value));
break;
case RPC_ADDRESS:
- SystemTable.updatePeerInfo(endpoint, "rpc_address", quote(entry.getValue().value));
+ SystemKeyspace.updatePeerInfo(endpoint, "rpc_address", quote(entry.getValue().value));
break;
case SCHEMA:
- SystemTable.updatePeerInfo(endpoint, "schema_version", entry.getValue().value);
+ SystemKeyspace.updatePeerInfo(endpoint, "schema_version", entry.getValue().value);
break;
case HOST_ID:
- SystemTable.updatePeerInfo(endpoint, "host_id", entry.getValue().value);
+ SystemKeyspace.updatePeerInfo(endpoint, "host_id", entry.getValue().value);
break;
}
}
[10/13] git commit: merge
Posted by br...@apache.org.
merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0a09edc8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0a09edc8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0a09edc8
Branch: refs/heads/cassandra-2.0
Commit: 0a09edc8180d4b0dae8c56dd64a1b1c531d684f8
Parents: b17629c
Author: Brandon Williams <br...@apache.org>
Authored: Tue May 6 16:12:58 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue May 6 16:12:58 2014 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/service/StorageService.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0a09edc8/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 38f1a99..0300f55 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1433,22 +1433,22 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
switch (entry.getKey())
{
case RELEASE_VERSION:
- SystemTable.updatePeerInfo(endpoint, "release_version", quote(entry.getValue().value));
+ SystemKeyspace.updatePeerInfo(endpoint, "release_version", quote(entry.getValue().value));
break;
case DC:
- SystemTable.updatePeerInfo(endpoint, "data_center", quote(entry.getValue().value));
+ SystemKeyspace.updatePeerInfo(endpoint, "data_center", quote(entry.getValue().value));
break;
case RACK:
- SystemTable.updatePeerInfo(endpoint, "rack", quote(entry.getValue().value));
+ SystemKeyspace.updatePeerInfo(endpoint, "rack", quote(entry.getValue().value));
break;
case RPC_ADDRESS:
- SystemTable.updatePeerInfo(endpoint, "rpc_address", quote(entry.getValue().value));
+ SystemKeyspace.updatePeerInfo(endpoint, "rpc_address", quote(entry.getValue().value));
break;
case SCHEMA:
- SystemTable.updatePeerInfo(endpoint, "schema_version", entry.getValue().value);
+ SystemKeyspace.updatePeerInfo(endpoint, "schema_version", entry.getValue().value);
break;
case HOST_ID:
- SystemTable.updatePeerInfo(endpoint, "host_id", entry.getValue().value);
+ SystemKeyspace.updatePeerInfo(endpoint, "host_id", entry.getValue().value);
break;
}
}
[02/13] git commit: Update peer information when a node jumps to
normal.
Posted by br...@apache.org.
Update peer information when a node jumps to normal.
Patch by brandonwilliams, reviewed by Richard Low for CASSANDRA-7122
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f4460a55
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f4460a55
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f4460a55
Branch: refs/heads/trunk
Commit: f4460a55b85759d2a631a2d931f10106e1748770
Parents: 64394b2
Author: Brandon Williams <br...@apache.org>
Authored: Tue May 6 16:10:10 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue May 6 16:10:10 2014 -0500
----------------------------------------------------------------------
.../cassandra/service/StorageService.java | 30 ++++++++++++++++++++
1 file changed, 30 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4460a55/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 bfca642..ed6d031 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1383,6 +1383,35 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
}
}
+ private void updatePeerInfo(InetAddress endpoint)
+ {
+ EndpointState epState = Gossiper.instance.getEndpointStateForEndpoint(endpoint);
+ for (Map.Entry<ApplicationState, VersionedValue> entry : epState.getApplicationStateMap().entrySet())
+ {
+ switch (entry.getKey())
+ {
+ case RELEASE_VERSION:
+ SystemTable.updatePeerInfo(endpoint, "release_version", quote(entry.getValue().value));
+ break;
+ case DC:
+ SystemTable.updatePeerInfo(endpoint, "data_center", quote(entry.getValue().value));
+ break;
+ case RACK:
+ SystemTable.updatePeerInfo(endpoint, "rack", quote(entry.getValue().value));
+ break;
+ case RPC_ADDRESS:
+ SystemTable.updatePeerInfo(endpoint, "rpc_address", quote(entry.getValue().value));
+ break;
+ case SCHEMA:
+ SystemTable.updatePeerInfo(endpoint, "schema_version", entry.getValue().value);
+ break;
+ case HOST_ID:
+ SystemTable.updatePeerInfo(endpoint, "host_id", entry.getValue().value);
+ break;
+ }
+ }
+ }
+
private String quote(String value)
{
return "'" + value + "'";
@@ -1484,6 +1513,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
if (tokenMetadata.isMember(endpoint))
logger.info("Node " + endpoint + " state jump to normal");
+ updatePeerInfo(endpoint);
// Order Matters, TM.updateHostID() should be called before TM.updateNormalToken(), (see CASSANDRA-4300).
if (Gossiper.instance.usesHostId(endpoint))
{
[03/13] git commit: Update peer information when a node jumps to
normal.
Posted by br...@apache.org.
Update peer information when a node jumps to normal.
Patch by brandonwilliams, reviewed by Richard Low for CASSANDRA-7122
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f4460a55
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f4460a55
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f4460a55
Branch: refs/heads/cassandra-2.0
Commit: f4460a55b85759d2a631a2d931f10106e1748770
Parents: 64394b2
Author: Brandon Williams <br...@apache.org>
Authored: Tue May 6 16:10:10 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue May 6 16:10:10 2014 -0500
----------------------------------------------------------------------
.../cassandra/service/StorageService.java | 30 ++++++++++++++++++++
1 file changed, 30 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4460a55/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 bfca642..ed6d031 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1383,6 +1383,35 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
}
}
+ private void updatePeerInfo(InetAddress endpoint)
+ {
+ EndpointState epState = Gossiper.instance.getEndpointStateForEndpoint(endpoint);
+ for (Map.Entry<ApplicationState, VersionedValue> entry : epState.getApplicationStateMap().entrySet())
+ {
+ switch (entry.getKey())
+ {
+ case RELEASE_VERSION:
+ SystemTable.updatePeerInfo(endpoint, "release_version", quote(entry.getValue().value));
+ break;
+ case DC:
+ SystemTable.updatePeerInfo(endpoint, "data_center", quote(entry.getValue().value));
+ break;
+ case RACK:
+ SystemTable.updatePeerInfo(endpoint, "rack", quote(entry.getValue().value));
+ break;
+ case RPC_ADDRESS:
+ SystemTable.updatePeerInfo(endpoint, "rpc_address", quote(entry.getValue().value));
+ break;
+ case SCHEMA:
+ SystemTable.updatePeerInfo(endpoint, "schema_version", entry.getValue().value);
+ break;
+ case HOST_ID:
+ SystemTable.updatePeerInfo(endpoint, "host_id", entry.getValue().value);
+ break;
+ }
+ }
+ }
+
private String quote(String value)
{
return "'" + value + "'";
@@ -1484,6 +1513,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
if (tokenMetadata.isMember(endpoint))
logger.info("Node " + endpoint + " state jump to normal");
+ updatePeerInfo(endpoint);
// Order Matters, TM.updateHostID() should be called before TM.updateNormalToken(), (see CASSANDRA-4300).
if (Gossiper.instance.usesHostId(endpoint))
{