sijie closed pull request #836: Fix Flaky CreateNewLogTest
URL: https://github.com/apache/bookkeeper/pull/836
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 182ae0154..33642c279 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 void testCreateNewLog() throws Exception {
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 void testCreateNewLog() throws Exception {
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 void testCreateNewLogWithNoWritableLedgerDirs()
throws Exception {
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 void testCreateNewLogWithNoWritableLedgerDirs()
throws Exception {
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();
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
