Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 e5a76bdb5 -> 5ab14968e
Lower sleep time to avoid timeout of IndexSummaryManagerTest.testCompactionRace patch by awiesberg; reviewed by tjake for CASSANDRA-9271 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4362e71e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4362e71e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4362e71e Branch: refs/heads/cassandra-2.2 Commit: 4362e71e55295067fd8de3a3206e0ff179bfcaf9 Parents: ae04861 Author: T Jake Luciani <j...@apache.org> Authored: Fri May 22 11:48:45 2015 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Fri May 22 11:48:45 2015 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/compaction/CompactionManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4362e71e/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java index 47bd2d6..fd28ceb 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java @@ -1484,7 +1484,7 @@ public class CompactionManager implements CompactionManagerMBean while (System.nanoTime() - start < delay) { if (CompactionManager.instance.isCompacting(cfss)) - Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS); + Uninterruptibles.sleepUninterruptibly(1, TimeUnit.MILLISECONDS); else break; }
