Repository: cassandra Updated Branches: refs/heads/cassandra-3.9 5e111e64d -> ed9014818 refs/heads/trunk e7dcbd64a -> a8f6a6945
Fix CommitLogStressTest timeout Patch by jmckenzie; reviewed by blambov for CASSANDRA-12207 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed901481 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed901481 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed901481 Branch: refs/heads/cassandra-3.9 Commit: ed9014818cb747ab9d3899d0d5bc5305feb388ee Parents: 5e111e6 Author: Josh McKenzie <jmcken...@apache.org> Authored: Fri Jul 22 12:34:52 2016 -0400 Committer: Josh McKenzie <jmcken...@apache.org> Committed: Fri Jul 22 12:34:52 2016 -0400 ---------------------------------------------------------------------- .../org/apache/cassandra/db/commitlog/CommitLogStressTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed901481/test/long/org/apache/cassandra/db/commitlog/CommitLogStressTest.java ---------------------------------------------------------------------- diff --git a/test/long/org/apache/cassandra/db/commitlog/CommitLogStressTest.java b/test/long/org/apache/cassandra/db/commitlog/CommitLogStressTest.java index 06c252f..239077e 100644 --- a/test/long/org/apache/cassandra/db/commitlog/CommitLogStressTest.java +++ b/test/long/org/apache/cassandra/db/commitlog/CommitLogStressTest.java @@ -130,12 +130,12 @@ public class CommitLogStressTest SchemaLoader.loadSchema(); SchemaLoader.schemaDefinition(""); // leave def. blank to maintain old behaviour + CommitLog.instance.stopUnsafe(true); } @Before public void cleanDir() throws IOException { - CommitLog.instance.stopUnsafe(true); File dir = new File(location); if (dir.isDirectory()) { @@ -208,9 +208,9 @@ public class CommitLogStressTest for (CommitLogSync sync : CommitLogSync.values()) { DatabaseDescriptor.setCommitLogSync(sync); - CommitLog commitLog = new CommitLog(CommitLogArchiver.disabled()).start(); - // Need to enable reserve segment creation as close to test start as possible to minimize race + CommitLog commitLog = new CommitLog(CommitLogArchiver.disabled()); commitLog.segmentManager.enableReserveSegmentCreation(); + commitLog.start(); testLog(commitLog); assert !failed; }