-
Notifications
You must be signed in to change notification settings - Fork 977
BP-47 (task7): DbLedgerStorage add direct entry logger support #3366
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.
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
Merged
eolivelli
merged 9 commits into
apache:master
from
hangc0276:chenhang/directio-part7-dbledgerStorage-support-directio
Jul 4, 2022
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
6cc3a35
DbLedgerStorage add direct entry logger support
hangc0276 1214445
format code
hangc0276 ff139a5
address comments
hangc0276 6cc6e58
format code
hangc0276 3c13eea
add unit test assert
hangc0276 4a605f7
format code
hangc0276 ce55bd3
format code
hangc0276 929a410
fix failed test
hangc0276 5da73f4
format code
hangc0276 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 60 additions & 0 deletions
60
...va/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageWithDirectEntryLoggerTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /** | ||
| * | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| * | ||
| */ | ||
| package org.apache.bookkeeper.bookie.storage.ldb; | ||
|
|
||
| import static org.junit.Assert.assertTrue; | ||
| import java.io.File; | ||
| import org.apache.bookkeeper.bookie.BookieImpl; | ||
| import org.apache.bookkeeper.bookie.TestBookieImpl; | ||
| import org.apache.bookkeeper.bookie.storage.directentrylogger.DirectEntryLogger; | ||
| import org.apache.bookkeeper.conf.TestBKConfiguration; | ||
| import org.junit.Before; | ||
|
|
||
| /** | ||
| * Unit test for {@link DbLedgerStorage} with directIO entrylogger. | ||
| */ | ||
| public class DbLedgerStorageWithDirectEntryLoggerTest extends DbLedgerStorageTest { | ||
|
|
||
| @Override | ||
| @Before | ||
| public void setup() throws Exception { | ||
| tmpDir = File.createTempFile("bkTest", ".dir"); | ||
| tmpDir.delete(); | ||
| tmpDir.mkdir(); | ||
| File curDir = BookieImpl.getCurrentDirectory(tmpDir); | ||
| BookieImpl.checkDirectoryStructure(curDir); | ||
|
|
||
| int gcWaitTime = 1000; | ||
| conf = TestBKConfiguration.newServerConfiguration(); | ||
| conf.setGcWaitTime(gcWaitTime); | ||
| conf.setLedgerStorageClass(DbLedgerStorage.class.getName()); | ||
| conf.setLedgerDirNames(new String[] { tmpDir.toString() }); | ||
| conf.setProperty("dbStorage_directIOEntryLogger", true); | ||
| BookieImpl bookie = new TestBookieImpl(conf); | ||
|
|
||
| ledgerDirsManager = bookie.getLedgerDirsManager(); | ||
| storage = (DbLedgerStorage) bookie.getLedgerStorage(); | ||
|
|
||
| storage.getLedgerStorageList().forEach(singleDirectoryDbLedgerStorage -> { | ||
| assertTrue(singleDirectoryDbLedgerStorage.getEntryLogger() instanceof DirectEntryLogger); | ||
| }); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it possible to add some assertions in the tests about the fact that we really loaded this implementation?
The tests may pass because we aren't using the new implementation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done