Skip to content

EntryLogTest,LedgerCacheTest: use correct tmp dir #910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
athanatos wants to merge 1 commit into from
Closed

EntryLogTest,LedgerCacheTest: use correct tmp dir #910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/EntryLogTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ public void testCorruptEntryLog() throws Exception {

int gcWaitTime = 1000;
ServerConfiguration conf = TestBKConfiguration.newServerConfiguration();
conf.setJournalDirName(tmpDir.toString());

conf.setGcWaitTime(gcWaitTime);
conf.setLedgerDirNames(new String[] {tmpDir.toString()});
Bookie bookie = new Bookie(conf);
Expand Down Expand Up @@ -120,6 +122,7 @@ public void testMissingLogId() throws Exception {
Bookie.checkDirectoryStructure(curDir);

ServerConfiguration conf = TestBKConfiguration.newServerConfiguration();
conf.setJournalDirName(tmpDir.toString());
conf.setLedgerDirNames(new String[] {tmpDir.toString()});
Bookie bookie = new Bookie(conf);
// create some entries
Expand Down Expand Up @@ -206,6 +209,7 @@ public void testAddEntryFailureOnDiskFull() throws Exception {
File ledgerDir1 = createTempDir("bkTest", ".dir");
File ledgerDir2 = createTempDir("bkTest", ".dir");
ServerConfiguration conf = TestBKConfiguration.newServerConfiguration();
conf.setJournalDirName(ledgerDir1.toString());
conf.setLedgerDirNames(new String[] { ledgerDir1.getAbsolutePath(),
ledgerDir2.getAbsolutePath() });
Bookie bookie = new Bookie(conf);
Expand Down Expand Up @@ -240,6 +244,8 @@ public void testRecoverFromLedgersMap() throws Exception {

int gcWaitTime = 1000;
ServerConfiguration conf = TestBKConfiguration.newServerConfiguration();
conf.setJournalDirName(tmpDir.toString());

conf.setGcWaitTime(gcWaitTime);
conf.setLedgerDirNames(new String[] {tmpDir.toString()});
Bookie bookie = new Bookie(conf);
Expand Down Expand Up @@ -276,6 +282,7 @@ public void testRecoverFromLedgersMapOnV0EntryLog() throws Exception {
ServerConfiguration conf = TestBKConfiguration.newServerConfiguration();
conf.setGcWaitTime(gcWaitTime);
conf.setLedgerDirNames(new String[] { tmpDir.toString() });
conf.setJournalDirName(tmpDir.toString());
Bookie bookie = new Bookie(conf);

// create some entries
Expand Down
2 changes: 2 additions & 0 deletions bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerCacheTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ public void testLedgerCacheFlushFailureOnDiskFull() throws Exception {
File ledgerDir2 = createTempDir("bkTest", ".dir");
ServerConfiguration conf = TestBKConfiguration.newServerConfiguration();
conf.setLedgerDirNames(new String[] { ledgerDir1.getAbsolutePath(), ledgerDir2.getAbsolutePath() });
conf.setJournalDirName(ledgerDir1.toString());

Bookie bookie = new Bookie(conf);
InterleavedLedgerStorage ledgerStorage = ((InterleavedLedgerStorage) bookie.ledgerStorage);
Expand Down Expand Up @@ -517,6 +518,7 @@ public void testEntryMemTableFlushFailure() throws Exception {
ServerConfiguration conf = TestBKConfiguration.newServerConfiguration();
conf.setGcWaitTime(gcWaitTime);
conf.setLedgerDirNames(new String[] { tmpDir.toString() });
conf.setJournalDirName(tmpDir.toString());
conf.setLedgerStorageClass(FlushTestSortedLedgerStorage.class.getName());

Bookie bookie = new Bookie(conf);
Expand Down