Skip to content
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

validate diskUsageThreshold and diskUsageLwmThreshold #3285

Merged
merged 7 commits into from
Jul 26, 2022
Merged

validate diskUsageThreshold and diskUsageLwmThreshold #3285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a7d93ec
validate diskUsageThreshold and diskUsageLwmThreshold
wenbingshen May 21, 2022
bbc5334
fix test failed
wenbingshen May 21, 2022
e4207b4
Merge remote-tracking branch 'srb/master' into validateLwmThreshold
wenbingshen Jul 14, 2022
fadce90
Merge remote-tracking branch 'srb/master' into validateLwmThreshold
wenbingshen Jul 19, 2022
ea703b8
Merge remote-tracking branch 'srb/master' into validateLwmThreshold
wenbingshen Jul 22, 2022
5c8b919
addressed reviewer's comments
wenbingshen Jul 22, 2022
d213bec
remove unused import VisibleForTesting
wenbingshen Jul 22, 2022
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
9 changes: 9 additions & 0 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 @@ -59,6 +59,7 @@ class LedgerDirsMonitor {
public LedgerDirsMonitor(final ServerConfiguration conf,
final DiskChecker diskChecker,
final List<LedgerDirsManager> dirsManagers) {
validateThreshold(conf.getDiskUsageThreshold(), conf.getDiskLowWaterMarkUsageThreshold());
this.interval = conf.getDiskCheckInterval();
this.minUsableSizeForHighPriorityWrites = conf.getMinUsableSizeForHighPriorityWrites();
this.conf = conf;
Expand Down Expand Up @@ -229,5 +230,13 @@ private void checkDirs(final LedgerDirsManager ldm)
}
ldm.getWritableLedgerDirs();
}

private void validateThreshold(float diskSpaceThreshold, float diskSpaceLwmThreshold) {
if (diskSpaceThreshold <= 0 || diskSpaceThreshold >= 1 || diskSpaceLwmThreshold - diskSpaceThreshold > 1e-6) {
throw new IllegalArgumentException("Disk space threashold: "
+ diskSpaceThreshold + " and lwm threshold: " + diskSpaceLwmThreshold
+ " are not valid. Should be > 0 and < 1 and diskSpaceThreshold >= diskSpaceLwmThreshold");
}
}
}

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 @@ -428,6 +428,35 @@ public void testLedgerDirsMonitorStartReadOnly() throws Exception {
verifyUsage(curDir1, nospace + 0.05f, curDir2, nospace + 0.05f, mockLedgerDirsListener, true);
}

@Test
public void testValidateLwmThreshold() {
final ServerConfiguration configuration = TestBKConfiguration.newServerConfiguration();
// check failed because diskSpaceThreshold < diskSpaceLwmThreshold
configuration.setDiskUsageThreshold(0.65f);
configuration.setDiskLowWaterMarkUsageThreshold(0.90f);
try {
new LedgerDirsMonitor(configuration, mockDiskChecker, Collections.singletonList(dirsManager));
fail("diskSpaceThreshold < diskSpaceLwmThreshold, should be failed.");
} catch (Exception e) {
assertTrue(e.getMessage().contains("diskSpaceThreshold >= diskSpaceLwmThreshold"));
}

// check failed because diskSpaceThreshold = 0 and diskUsageLwmThreshold = 1
configuration.setDiskUsageThreshold(0f);
configuration.setDiskLowWaterMarkUsageThreshold(1f);
try {
new LedgerDirsMonitor(configuration, mockDiskChecker, Collections.singletonList(dirsManager));
fail("diskSpaceThreshold = 0 and diskUsageLwmThreshold = 1, should be failed.");
} catch (Exception e) {
assertTrue(e.getMessage().contains("Should be > 0 and < 1"));
}

// check succeeded
configuration.setDiskUsageThreshold(0.95f);
configuration.setDiskLowWaterMarkUsageThreshold(0.90f);
new LedgerDirsMonitor(configuration, mockDiskChecker, Collections.singletonList(dirsManager));
}

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