Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 d826c8187 -> e7299c08f refs/heads/cassandra-3.11 cbc26d81d -> 28b75ba35 refs/heads/trunk e7e936735 -> 772f0ea9d
Don't block RepairJob execution on validation futures Patch by Blake Eggleston; reviewed by Marcus Eriksson for CASSANDRA-13797 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e7299c08 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7299c08 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e7299c08 Branch: refs/heads/cassandra-3.0 Commit: e7299c08f940057e8fd4dfa3f24dcc6e0cb5f78d Parents: d826c81 Author: Blake Eggleston <bdeggles...@gmail.com> Authored: Thu Aug 24 15:16:37 2017 -0700 Committer: Blake Eggleston <bdeggles...@gmail.com> Committed: Wed Sep 13 14:58:03 2017 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/repair/RepairJob.java | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7299c08/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 4d2d5e7..7ce298d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.0.15 + * Don't block RepairJob execution on validation futures (CASSANDRA-13797) * Wait for all management tasks to complete before shutting down CLSM (CASSANDRA-13123) * INSERT statement fails when Tuple type is used as clustering column with default DESC order (CASSANDRA-13717) * Fix pending view mutations handling and cleanup batchlog when there are local and remote paired mutations (CASSANDRA-13069) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7299c08/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 cba176c..0711a64 100644 --- a/src/java/org/apache/cassandra/repair/RepairJob.java +++ b/src/java/org/apache/cassandra/repair/RepairJob.java @@ -155,9 +155,6 @@ 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
