Updated Branches: refs/heads/cassandra-1.0 181022bd5 -> 83119656a
0001-CASSANDRA-3736-remove-token-from-systable-when-replaced Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/83119656 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83119656 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/83119656 Branch: refs/heads/cassandra-1.0 Commit: 83119656a2f54db064ec1479eddb826d8fcaf7de Parents: 181022b Author: Vijay Parthasarathy <vijay2...@gmail.com> Authored: Thu Jan 19 13:04:21 2012 -0800 Committer: Vijay Parthasarathy <vijay2...@gmail.com> Committed: Thu Jan 19 13:04:21 2012 -0800 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/SystemTable.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/83119656/src/java/org/apache/cassandra/db/SystemTable.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/SystemTable.java b/src/java/org/apache/cassandra/db/SystemTable.java index 8f1adfc..c831382 100644 --- a/src/java/org/apache/cassandra/db/SystemTable.java +++ b/src/java/org/apache/cassandra/db/SystemTable.java @@ -139,7 +139,10 @@ public class SystemTable public static synchronized void updateToken(InetAddress ep, Token token) { if (ep == FBUtilities.getLocalAddress()) + { + removeToken(token); return; + } IPartitioner p = StorageService.getPartitioner(); ColumnFamily cf = ColumnFamily.create(Table.SYSTEM_TABLE, STATUS_CF); cf.addColumn(new Column(p.getTokenFactory().toByteArray(token), ByteBuffer.wrap(ep.getAddress()), System.currentTimeMillis()));