natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correctly delete scheduled range xfers 

Patch by brandonwilliams, reviewed by aleksey for CASSANDRA-7143
This commit is contained in:
Brandon Williams 2014-05-05 11:45:09 -05:00
parent 0ce6b179af
commit 8bbe901f2a
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -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)

6
src/java/org/apache/cassandra/service/ScheduledRangeTransferExecutorService.java
View File

@ -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)));
}

2
src/java/org/apache/cassandra/service/StorageService.java
View File

@ -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)
{