Repository: cassandra Updated Branches: refs/heads/trunk ff29d6099 -> 3e8f3c5ed
Allow sub-range repairs (specifying -et -st) for a preview of repaired data Patch by Matt Byrd; reviewed by marcuse for CASSANDRA-13570 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3e8f3c5e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e8f3c5e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e8f3c5e Branch: refs/heads/trunk Commit: 3e8f3c5ed06242a6aedf76c216b1c48c105f84e6 Parents: ff29d60 Author: Matt Byrd <matthew.l.b...@gmail.com> Authored: Thu Jun 8 16:21:19 2017 -0700 Committer: Marcus Eriksson <marc...@apache.org> Committed: Mon Jun 12 14:15:23 2017 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/repair/messages/RepairOption.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e8f3c5e/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 4425aad..291d93a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0 + * Allow sub-range repairs for a preview of repaired data (CASSANDRA-13570) * NPE in IR cleanup when columnfamily has no sstables (CASSANDRA-13585) * Fix Randomness of stress values (CASSANDRA-12744) * Allow selecting Map values and Set elements (CASSANDRA-7396) http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e8f3c5e/src/java/org/apache/cassandra/repair/messages/RepairOption.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/repair/messages/RepairOption.java b/src/java/org/apache/cassandra/repair/messages/RepairOption.java index b6f125a..6d69cf0 100644 --- a/src/java/org/apache/cassandra/repair/messages/RepairOption.java +++ b/src/java/org/apache/cassandra/repair/messages/RepairOption.java @@ -244,7 +244,7 @@ public class RepairOption } } - if (option.isIncremental() && !option.isGlobal()) + if (option.isIncremental() && !option.isPreview() && !option.isGlobal()) { throw new IllegalArgumentException("Incremental repairs cannot be run against a subset of tokens or ranges"); } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
