eolivelli commented on code in PR #3212:
URL: https://github.com/apache/bookkeeper/pull/3212#discussion_r857118720
##########
bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerDirsMonitor.java:
##########
@@ -68,6 +68,10 @@ public LedgerDirsMonitor(final ServerConfiguration conf,
private void check(final LedgerDirsManager ldm) {
final ConcurrentMap<File, Float> diskUsages = ldm.getDiskUsages();
+ boolean anyDiskFulled = false;
+ boolean highPriorityWritesAllowed = true;
+ boolean anyDiskRecovered = false;
Review Comment:
someDiskRecovered sounds better
##########
bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerDirsManagerTest.java:
##########
@@ -240,6 +240,76 @@ private void testLedgerDirsMonitorDuringTransition(boolean
highPriorityWritesAll
assertTrue(mockLedgerDirsListener.highPriorityWritesAllowed);
}
+ @Test
+ public void testIsReadOnlyModeOnAnyDiskFullEnabled() throws Exception {
+ testAnyLedgerFullTransitToReadOnly(true);
+ testAnyLedgerFullTransitToReadOnly(false);
+ }
+
+ public void testAnyLedgerFullTransitToReadOnly(boolean
isReadOnlyModeOnAnyDiskFullEnabled) throws Exception {
+ ledgerMonitor.shutdown();
+
+ final float nospace = 0.90f;
+ final float lwm = 0.80f;
+ HashMap<File, Float> usageMap;
+
+ File tmpDir1 = createTempDir("bkTest", ".dir");
+ File curDir1 = BookieImpl.getCurrentDirectory(tmpDir1);
+ BookieImpl.checkDirectoryStructure(curDir1);
+
+ File tmpDir2 = createTempDir("bkTest", ".dir");
+ File curDir2 = BookieImpl.getCurrentDirectory(tmpDir2);
+ BookieImpl.checkDirectoryStructure(curDir2);
+
+ conf.setDiskUsageThreshold(nospace);
+ conf.setDiskLowWaterMarkUsageThreshold(lwm);
+ conf.setDiskUsageWarnThreshold(nospace);
+
conf.setReadOnlyModeOnAnyDiskFullEnabled(isReadOnlyModeOnAnyDiskFullEnabled);
+ conf.setLedgerDirNames(new String[] { tmpDir1.toString(),
tmpDir2.toString() });
+
+ mockDiskChecker = new MockDiskChecker(nospace, warnThreshold);
+ dirsManager = new LedgerDirsManager(conf, conf.getLedgerDirs(),
+ new DiskChecker(conf.getDiskUsageThreshold(),
conf.getDiskUsageWarnThreshold()), statsLogger);
+ ledgerMonitor = new LedgerDirsMonitor(conf, mockDiskChecker,
Collections.singletonList(dirsManager));
+ usageMap = new HashMap<>();
+ usageMap.put(curDir1, 0.1f);
+ usageMap.put(curDir2, 0.1f);
+ mockDiskChecker.setUsageMap(usageMap);
+ ledgerMonitor.init();
+ final MockLedgerDirsListener mockLedgerDirsListener = new
MockLedgerDirsListener();
+ dirsManager.addLedgerDirsListener(mockLedgerDirsListener);
+ ledgerMonitor.start();
+
+ Thread.sleep((diskCheckInterval * 2) + 100);
+ assertFalse(mockLedgerDirsListener.readOnly);
Review Comment:
Can we use awaitility here?
##########
bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerDirsMonitor.java:
##########
@@ -68,6 +68,10 @@ public LedgerDirsMonitor(final ServerConfiguration conf,
private void check(final LedgerDirsManager ldm) {
final ConcurrentMap<File, Float> diskUsages = ldm.getDiskUsages();
+ boolean anyDiskFulled = false;
Review Comment:
What about 'SomeDiskFull'
##########
bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java:
##########
@@ -2395,6 +2396,27 @@ public boolean isReadOnlyModeEnabled() {
return getBoolean(READ_ONLY_MODE_ENABLED, true);
}
+ /**
+ * Set whether the bookie is able to go into read-only mode when any disk
is full.
+ * If this set to false, it will behave to READ_ONLY_MODE_ENABLED flag.
+ *
+ * @param enabled whether to enable read-only mode when any disk is full.
+ * @return
+ */
+ public ServerConfiguration setReadOnlyModeOnAnyDiskFullEnabled(boolean
enabled) {
+ setProperty(READ_ONLY_MODE_ON_ANY_DISK_FULL_ENABLED, enabled);
+ return this;
+ }
+
+ /**
+ * Get whether read-only mode is enable when any disk is full. The default
is false.
+ *
+ * @return boolean
+ */
+ public boolean isReadOnlyModeOnAnyDiskFullEnabled() {
+ return getBoolean(READ_ONLY_MODE_ON_ANY_DISK_FULL_ENABLED, false);
Review Comment:
In this case it is better to set this to true.
It is a safe feature and if we don't enable it by default nobody will
leverage it
I wonder if we need a flag at all.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
