Correctly delete scheduled range xfers Patch by brandonwilliams, reviewed by aleksey for CASSANDRA-7143
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8bbe901f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8bbe901f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8bbe901f Branch: refs/heads/cassandra-2.0 Commit: 8bbe901f2a7c2799fd2fd466e360e4d5c39224d9 Parents: 0ce6b17 Author: Brandon Williams <[email protected]> Authored: Mon May 5 11:45:09 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Mon May 5 11:47:27 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../service/ScheduledRangeTransferExecutorService.java | 6 +++--- src/java/org/apache/cassandra/service/StorageService.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bbe901f/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index f4e14d8..25a5cc1 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.0.8 + * Correctly delete scheduled range xfers (CASSANDRA-7143) * Make batchlog replica selection rack-aware (CASSANDRA-6551) * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072) * Set JMX RMI port to 7199 (CASSANDRA-7087) http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bbe901f/src/java/org/apache/cassandra/service/ScheduledRangeTransferExecutorService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/ScheduledRangeTransferExecutorService.java b/src/java/org/apache/cassandra/service/ScheduledRangeTransferExecutorService.java index a231737..5591ea4 100644 --- a/src/java/org/apache/cassandra/service/ScheduledRangeTransferExecutorService.java +++ b/src/java/org/apache/cassandra/service/ScheduledRangeTransferExecutorService.java @@ -59,7 +59,7 @@ public class ScheduledRangeTransferExecutorService { if (scheduler == null) { - LOG.warn("Unabled to shutdown; Scheduler never enabled"); + LOG.warn("Unable to shutdown; Scheduler never enabled"); return; } @@ -78,7 +78,7 @@ class RangeTransfer implements Runnable if (res.size() < 1) { - LOG.debug("No queued ranges to transfer"); + LOG.info("No queued ranges to transfer, shuffle complete. Run 'cassandra-shuffle disable' to stop this message."); return; } @@ -103,7 +103,7 @@ class RangeTransfer implements Runnable finally { LOG.debug("Removing queued entry for transfer of {}", token); - processInternal(String.format("DELETE FROM system.%s WHERE token_bytes = '%s'", + processInternal(String.format("DELETE FROM system.%s WHERE token_bytes = 0x%s", SystemKeyspace.RANGE_XFERS_CF, ByteBufferUtil.bytesToHex(tokenBytes))); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bbe901f/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 4fbaffe2..595a7e7 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -3105,7 +3105,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE private class RangeRelocator { - private StreamPlan streamPlan = new StreamPlan("Bootstrap"); + private StreamPlan streamPlan = new StreamPlan("Relocation"); private RangeRelocator(Collection<Token> tokens, List<String> keyspaceNames) {
