Skip to content

Fix the bookie doesn't transition to writable #4225

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

Open
zymap wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix the bookie doesn't transition to writable #4225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8845a77
Fix the bookie doesn't transition to writable
zymap Mar 6, 2024
5294415
Fix the ci error
zymap Mar 6, 2024
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
14 changes: 12 additions & 2 deletions bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerDirsMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public LedgerDirsMonitor(final ServerConfiguration conf,
this.dirsManagers = dirsManagers;
}

private void check(final LedgerDirsManager ldm) {
void check(final LedgerDirsManager ldm, boolean notifyDiskWritable) {
final ConcurrentMap<File, Float> diskUsages = ldm.getDiskUsages();
boolean someDiskFulled = false;
boolean highPriorityWritesAllowed = true;
Expand All @@ -78,6 +78,11 @@ private void check(final LedgerDirsManager ldm) {
for (File dir : writableDirs) {
try {
diskUsages.put(dir, diskChecker.checkDir(dir));
if (notifyDiskWritable) {
for (LedgerDirsListener listener : ldm.getListeners()) {
listener.diskWritable(dir);
}
}
} catch (DiskErrorException e) {
LOG.error("Ledger directory {} failed on disk checking : ", dir, e);
// Notify disk failure to all listeners
Expand Down Expand Up @@ -193,7 +198,11 @@ private void check(final LedgerDirsManager ldm) {
}

private void check() {
dirsManagers.forEach(this::check);
check(false);
}

private void check(boolean notifyDiskWritable) {
dirsManagers.forEach(ldm -> check(ldm, notifyDiskWritable));
}

/**
Expand All @@ -207,6 +216,7 @@ private void check() {
*/
public void init() throws DiskErrorException, NoWritableLedgerDirException {
checkDirs();
check(true);
}

// start the daemon for disk monitoring
Expand Down
29 changes: 29 additions & 0 deletions bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerDirsManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,35 @@ public void testValidateLwmThreshold() {
new LedgerDirsMonitor(configuration, mockDiskChecker, Collections.singletonList(dirsManager));
}

@Test
public void testBookieStartWithReadonlyAndDiskIsLowerThanThreshold() throws Exception {
File tmpDir1 = createTempDir("bkTest", ".dir");
File curDir1 = BookieImpl.getCurrentDirectory(tmpDir1);
BookieImpl.checkDirectoryStructure(curDir1);

final ServerConfiguration configuration = TestBKConfiguration.newServerConfiguration();
configuration.setDiskUsageThreshold(0.95f);
configuration.setDiskUsageWarnThreshold(0.80f);
configuration.setDiskLowWaterMarkUsageThreshold(0.80f);
configuration.setLedgerDirNames(new String[]{tmpDir1.toString()});

MockDiskChecker diskChecker = new MockDiskChecker(
configuration.getDiskUsageThreshold(), configuration.getDiskUsageWarnThreshold());

LedgerDirsManager ldm = new LedgerDirsManager(
configuration, configuration.getLedgerDirs(), diskChecker, statsLogger);
LedgerDirsMonitor ldmMonitor = new LedgerDirsMonitor(
configuration, diskChecker, Collections.singletonList(ldm));
MockLedgerDirsListener mockLedgerDirsListener = new MockLedgerDirsListener();
mockLedgerDirsListener.readOnly = true;
ldm.addLedgerDirsListener(mockLedgerDirsListener);
HashMap<File, Float> usageMap = new HashMap<>();
usageMap.put(curDir1, 0.75f);
diskChecker.setUsageMap(usageMap);
ldmMonitor.init();
assertFalse(mockLedgerDirsListener.readOnly);
}

private void setUsageAndThenVerify(File dir1, float dir1Usage, File dir2, float dir2Usage,
MockDiskChecker mockDiskChecker, MockLedgerDirsListener mockLedgerDirsListener, boolean verifyReadOnly)
throws InterruptedException {
Expand Down