Updated Branches: refs/heads/trunk 2bc0d4db9 -> 739848602
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/73984860 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/73984860 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/73984860 Branch: refs/heads/trunk Commit: 739848602dc01b4f4d1893bf3aa38f5ddcf13267 Parents: 2bc0d4d Author: Vijay Parthasarathy <vijay2...@gmail.com> Authored: Thu Jan 19 12:59:50 2012 -0800 Committer: Vijay Parthasarathy <vijay2...@gmail.com> Committed: Thu Jan 19 12:59:50 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/73984860/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()));
