You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2013/03/11 22:23:28 UTC
[2/3] git commit: Fix repair -pr for vnodes;
patched by yukim reviewed by driftx for CASSANDRA-5329
Fix repair -pr for vnodes; patched by yukim reviewed by driftx for CASSANDRA-5329
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b5f17262
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b5f17262
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b5f17262
Branch: refs/heads/trunk
Commit: b5f172624af4083b3b7683060a595ca437daf4c7
Parents: 8d03008
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Mar 11 16:22:22 2013 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Mar 11 16:22:22 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/service/StorageService.java | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b5f17262/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 93c30c0..8b5674c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -17,6 +17,7 @@
backward compatibility (CASSANDRA-4795)
* Add binary protocol support to stress (CASSANDRA-4993)
* cqlsh: Fix COPY FROM value quoting and null handling (CASSANDRA-5305)
+ * Fix repair -pr for vnodes (CASSANDRA-5329)
Merged from 1.1:
* fix logging of "Found table data in data directories" when only system tables
are present (CASSANDRA-5289)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b5f17262/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 dfd948d..6e6f5ef 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2308,7 +2308,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
}
public int forceRepairAsync(final String keyspace, final boolean isSequential, final boolean isLocal, final boolean primaryRange, final String... columnFamilies)
{
- final Collection<Range<Token>> ranges = primaryRange ? Collections.singletonList(getLocalPrimaryRange()) : getLocalRanges(keyspace);
+ final Collection<Range<Token>> ranges = primaryRange ? getLocalPrimaryRanges() : getLocalRanges(keyspace);
return forceRepairAsync(keyspace, isSequential, isLocal, ranges, columnFamilies);
}