This is an automated email from the ASF dual-hosted git repository.
lushiji pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new b372e9031e [improve][conf] Change the default value of
readOnlyModeOnAnyDiskFullEnabled to true (#4520)
b372e9031e is described below
commit b372e9031e3f43adc831947332a6852680e750db
Author: Xiangying Meng <55571188+liangyepianz...@users.noreply.github.com>
AuthorDate: Mon Dec 2 09:09:27 2024 +0800
[improve][conf] Change the default value of
readOnlyModeOnAnyDiskFullEnabled to true (#4520)
* [improve][conf] Change the default value of
readOnlyModeOnAnyDiskFullEnabled to true
---
.../src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java | 4 ++--
.../test/java/org/apache/bookkeeper/bookie/LedgerDirsManagerTest.java | 4 ++--
.../src/test/java/org/apache/bookkeeper/test/ReadOnlyBookieTest.java | 1 +
conf/bk_server.conf | 4 ++--
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java
index cb731060c4..01848882c5 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java
@@ -2462,12 +2462,12 @@ public class ServerConfiguration extends
AbstractConfiguration<ServerConfigurati
}
/**
- * Get whether read-only mode is enable when any disk is full. The default
is false.
+ * Get whether read-only mode is enable when any disk is full. The default
is true.
*
* @return boolean
*/
public boolean isReadOnlyModeOnAnyDiskFullEnabled() {
- return getBoolean(READ_ONLY_MODE_ON_ANY_DISK_FULL_ENABLED, false);
+ return getBoolean(READ_ONLY_MODE_ON_ANY_DISK_FULL_ENABLED, true);
}
/**
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerDirsManagerTest.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerDirsManagerTest.java
index d6e01cec45..f46390e332 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerDirsManagerTest.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/LedgerDirsManagerTest.java
@@ -414,7 +414,7 @@ public class LedgerDirsManagerTest {
// one dir usagespace above storagethreshold, another dir below
storagethreshold
// should still be writable
setUsageAndThenVerify(curDir1, nospace + 0.02f, curDir2, nospace -
0.05f, mockDiskChecker,
- mockLedgerDirsListener, false);
+ mockLedgerDirsListener, true);
// should remain readonly
setUsageAndThenVerify(curDir1, nospace + 0.05f, curDir2, nospace +
0.02f, mockDiskChecker,
@@ -438,7 +438,7 @@ public class LedgerDirsManagerTest {
// overall diskusage is less than lwm
// should goto readwrite
setUsageAndThenVerify(curDir1, lwm - 0.17f, curDir2, nospace + 0.03f,
mockDiskChecker, mockLedgerDirsListener,
- false);
+ true);
assertEquals("Only one LedgerDir should be writable", 1,
dirsManager.getWritableLedgerDirs().size());
// bring both the dirs below lwm
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ReadOnlyBookieTest.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ReadOnlyBookieTest.java
index d3aa1ed7ad..ad03102c86 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ReadOnlyBookieTest.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ReadOnlyBookieTest.java
@@ -103,6 +103,7 @@ public class ReadOnlyBookieTest extends
BookKeeperClusterTestCase {
public void testBookieShouldTurnWritableFromReadOnly() throws Exception {
killBookie(0);
baseConf.setReadOnlyModeEnabled(true);
+ baseConf.setReadOnlyModeOnAnyDiskFullEnabled(false);
baseConf.setDiskCheckInterval(Integer.MAX_VALUE);
startNewBookie();
LedgerHandle ledger = bkc.createLedger(2, 2, DigestType.MAC,
diff --git a/conf/bk_server.conf b/conf/bk_server.conf
index 53ce8fe4d0..1dfb821524 100644
--- a/conf/bk_server.conf
+++ b/conf/bk_server.conf
@@ -181,8 +181,8 @@ extraServerComponents=
# If "readOnlyModeOnAnyDiskFullEnabled=true" then on any ledger disks full,
bookie will be converted
# to read-only mode and serve only read requests. When all disks recovered,
# the bookie will be converted to read-write mode.Otherwise it will obey the
`readOnlyModeEnabled` behavior.
-# By default this will be disabled.
-# readOnlyModeOnAnyDiskFullEnabled=false
+# By default this will be enable.
+# readOnlyModeOnAnyDiskFullEnabled=true
#############################################################################
## Netty server settings
