This is an automated email from the ASF dual-hosted git repository.
sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 50d50bd Fix Flaky CreateNewLogTest
50d50bd is described below
commit 50d50bd8064f67583c70688171bd3386ae418b64
Author: Sijie Guo <[email protected]>
AuthorDate: Wed Dec 13 13:45:04 2017 -0800
Fix Flaky CreateNewLogTest
Descriptions of the changes in this PR:
CreateNewLogTest becomes flaky after fixing #568 because preallocation can
happen in the background. Changing the sequence of creating entry logger and
entry log file injection to make the test sequence deterministic.
Author: Sijie Guo <[email protected]>
Reviewers: Enrico Olivelli <[email protected]>, Jia Zhai <None>
This closes #836 from sijie/fix_createnewlog_test
---
.../src/test/java/org/apache/bookkeeper/bookie/CreateNewLogTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CreateNewLogTest.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CreateNewLogTest.java
index 182ae01..33642c2 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CreateNewLogTest.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CreateNewLogTest.java
@@ -89,7 +89,6 @@ public class CreateNewLogTest {
conf.setLedgerDirNames(ledgerDirs);
LedgerDirsManager ledgerDirsManager = new LedgerDirsManager(conf,
conf.getLedgerDirs(),
new DiskChecker(conf.getDiskUsageThreshold(),
conf.getDiskUsageWarnThreshold()));
- EntryLogger el = new EntryLogger(conf, ledgerDirsManager);
// Extracted from createNewLog()
String logFileName = Long.toHexString(1) + ".log";
@@ -98,6 +97,7 @@ public class CreateNewLogTest {
File newLogFile = new File(dir, logFileName);
newLogFile.createNewFile();
+ EntryLogger el = new EntryLogger(conf, ledgerDirsManager);
// Calls createNewLog, and with the number of directories we
// are using, if it picks one at random it will fail.
el.createNewLog();
@@ -114,7 +114,6 @@ public class CreateNewLogTest {
conf.setIsForceGCAllowWhenNoSpace(true);
LedgerDirsManager ledgerDirsManager = new LedgerDirsManager(conf,
conf.getLedgerDirs(),
new DiskChecker(conf.getDiskUsageThreshold(),
conf.getDiskUsageWarnThreshold()));
- EntryLogger el = new EntryLogger(conf, ledgerDirsManager);
// Extracted from createNewLog()
String logFileName = Long.toHexString(1) + ".log";
@@ -129,6 +128,7 @@ public class CreateNewLogTest {
ledgerDirsManager.addToFilledDirs(tdir);
}
+ EntryLogger el = new EntryLogger(conf, ledgerDirsManager);
// Calls createNewLog, and with the number of directories we
// are using, if it picks one at random it will fail.
el.createNewLog();
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
