Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 598008d43 -> 00e5a3d50 refs/heads/cassandra-3.11 28ccf3fe3 -> e9462b9af refs/heads/trunk f165e72bf -> 703db6fff
Fix unbounded validation compactions on repair / revert CASSANDRA-13797 This reverts commit e7299c08f940057e8fd4dfa3f24dcc6e0cb5f78d. Patch by Kurt Greaves; Reviewed by Blake Eggleston for CASSANDRA-14332 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/00e5a3d5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/00e5a3d5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/00e5a3d5 Branch: refs/heads/cassandra-3.0 Commit: 00e5a3d508eb41944ce01c6cc96ae18cb16dad8c Parents: 598008d Author: kurt <k...@instaclustr.com> Authored: Tue Feb 27 05:24:25 2018 +0000 Committer: Blake Eggleston <bdeggles...@gmail.com> Committed: Tue Apr 17 14:04:09 2018 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/repair/RepairJob.java | 3 +++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/00e5a3d5/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index d3d8036..1aa291f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.0.17 + * Fix unbounded validation compactions on repair / revert CASSANDRA-13797 (CASSANDRA-14332) * Avoid deadlock when running nodetool refresh before node is fully up (CASSANDRA-14310) * Handle all exceptions when opening sstables (CASSANDRA-14202) * Handle incompletely written hint descriptors during startup (CASSANDRA-14080) http://git-wip-us.apache.org/repos/asf/cassandra/blob/00e5a3d5/src/java/org/apache/cassandra/repair/RepairJob.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/repair/RepairJob.java b/src/java/org/apache/cassandra/repair/RepairJob.java index 0711a64..cba176c 100644 --- a/src/java/org/apache/cassandra/repair/RepairJob.java +++ b/src/java/org/apache/cassandra/repair/RepairJob.java @@ -155,6 +155,9 @@ public class RepairJob extends AbstractFuture<RepairResult> implements Runnable setException(t); } }, taskExecutor); + + // Wait for validation to complete + Futures.getUnchecked(validations); } /** --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
