This is an automated email from the ASF dual-hosted git repository.
chenhang 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 dc2bb1dfed Enable reorder read sequence for bk client by default
(#4139)
dc2bb1dfed is described below
commit dc2bb1dfed38d7f9ad7a29fc92bd907e51af5b21
Author: Hang Chen <[email protected]>
AuthorDate: Thu Feb 1 14:49:07 2024 +0800
Enable reorder read sequence for bk client by default (#4139)
### Motivation
<!-- Explain here the context, and why you're making that change. What is
the problem you're trying to solve. -->
If one ledger's ensemble is [bk0, bk1] and bk0 is down, the bookie client
may send a read request to bk0 first then fail with the following errors, and
resend the read request to bk1 in the end.
```
2023-10-19T18:33:52,042 - ERROR -
[BookKeeperClientWorker-OrderedExecutor-3-0:PerChannelBookieClient@563] -
Cannot connect to 192.168.31.216:3181 as endpoint resolution failed (probably
bookie is down) err
org.apache.bookkeeper.proto.BookieAddressResolver$BookieIdNotResolvedException:
Cannot resolve bookieId 192.168.31.216:3181, bookie does not exist or it is not
running
2023-10-19T18:33:52,042 - INFO -
[BookKeeperClientWorker-OrderedExecutor-3-0:DefaultBookieAddressResolver@77] -
Cannot resolve 192.168.31.216:3181, bookie is unknown
org.apache.bookkeeper.client.BKException$BKBookieHandleNotAvailableException:
Bookie handle is not available
2023-10-19T18:33:52,042 - INFO -
[BookKeeperClientWorker-OrderedExecutor-3-0:PendingReadOp$LedgerEntryRequest@223]
- Error: Bookie handle is not available while reading L6 E40 from bookie:
192.168.31.216:3181
```
One of the related issues is in the auto-recovery decommission and there is
one PR in the BookKeeper repo: https://github.com/apache/bookkeeper/pull/4113
However, the bookie client already knows the bk0 is down and we should send
the read request to bk1 first. So we can reorder the read request based on the
known bookie list. If one bookie is lost, it will reorder the lost bookie to
the end of the read list.
### Modifications
<!-- Describe the modifications you've done. -->
Enable the `reorderReadSequence` by default for auto-recovery.
---
.../main/java/org/apache/bookkeeper/conf/ClientConfiguration.java | 2 +-
.../java/org/apache/bookkeeper/client/MockBookKeeperTestCase.java | 4 +++-
.../apache/bookkeeper/client/ReadLastConfirmedAndEntryOpTest.java | 7 ++++---
conf/bk_server.conf | 3 +++
4 files changed, 11 insertions(+), 5 deletions(-)
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ClientConfiguration.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ClientConfiguration.java
index 297a2f62f4..66dc160fd5 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ClientConfiguration.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ClientConfiguration.java
@@ -1148,7 +1148,7 @@ public class ClientConfiguration extends
AbstractConfiguration<ClientConfigurati
* @return true if reorder read sequence is enabled, otherwise false.
*/
public boolean isReorderReadSequenceEnabled() {
- return getBoolean(REORDER_READ_SEQUENCE_ENABLED, false);
+ return getBoolean(REORDER_READ_SEQUENCE_ENABLED, true);
}
/**
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/MockBookKeeperTestCase.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/MockBookKeeperTestCase.java
index e771012470..f43b6136c8 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/MockBookKeeperTestCase.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/MockBookKeeperTestCase.java
@@ -96,6 +96,7 @@ public abstract class MockBookKeeperTestCase {
protected BookieClient bookieClient;
protected LedgerManager ledgerManager;
protected LedgerIdGenerator ledgerIdGenerator;
+ protected EnsemblePlacementPolicy placementPolicy;
private BookieWatcher bookieWatcher;
@@ -152,6 +153,7 @@ public abstract class MockBookKeeperTestCase {
scheduler =
OrderedScheduler.newSchedulerBuilder().numThreads(4).name("bk-test").build();
executor = OrderedExecutor.newBuilder().build();
bookieWatcher = mock(BookieWatcher.class);
+ placementPolicy = new DefaultEnsemblePlacementPolicy();
bookieClient = mock(BookieClient.class);
ledgerManager = mock(LedgerManager.class);
@@ -194,7 +196,7 @@ public abstract class MockBookKeeperTestCase {
@Override
public EnsemblePlacementPolicy getPlacementPolicy() {
- return null;
+ return placementPolicy;
}
@Override
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/ReadLastConfirmedAndEntryOpTest.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/ReadLastConfirmedAndEntryOpTest.java
index 8e3cfd72e4..760f249018 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/ReadLastConfirmedAndEntryOpTest.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/ReadLastConfirmedAndEntryOpTest.java
@@ -85,7 +85,7 @@ public class ReadLastConfirmedAndEntryOpTest {
private ScheduledExecutorService scheduler;
private OrderedScheduler orderedScheduler;
private ClientInternalConf internalConf;
- private EnsemblePlacementPolicy mockPlacementPolicy;
+ private EnsemblePlacementPolicy placementPolicy;
private LedgerMetadata ledgerMetadata;
private DistributionSchedule distributionSchedule;
private DigestManager digestManager;
@@ -121,10 +121,11 @@ public class ReadLastConfirmedAndEntryOpTest {
.build();
this.mockBookieClient = mock(BookieClient.class);
- this.mockPlacementPolicy = mock(EnsemblePlacementPolicy.class);
+ //this.mockPlacementPolicy = mock(EnsemblePlacementPolicy.class);
+ this.placementPolicy = new DefaultEnsemblePlacementPolicy();
this.mockClientCtx = mock(ClientContext.class);
when(mockClientCtx.getBookieClient()).thenReturn(mockBookieClient);
-
when(mockClientCtx.getPlacementPolicy()).thenReturn(mockPlacementPolicy);
+ when(mockClientCtx.getPlacementPolicy()).thenReturn(placementPolicy);
when(mockClientCtx.getConf()).thenReturn(internalConf);
when(mockClientCtx.getScheduler()).thenReturn(orderedScheduler);
when(mockClientCtx.getMainWorkerPool()).thenReturn(orderedScheduler);
diff --git a/conf/bk_server.conf b/conf/bk_server.conf
index a391c1aa05..a36a2fbf97 100755
--- a/conf/bk_server.conf
+++ b/conf/bk_server.conf
@@ -1057,6 +1057,9 @@
statsProviderClass=org.apache.bookkeeper.stats.prometheus.PrometheusMetricsProvi
# Enable/disable having read operations for a ledger to be sticky to a single
bookie.
stickyReadSEnabled=true
+# Enable/disable reordering read sequence on reading entries.
+reorderReadSequenceEnabled=true
+
# The grace period, in milliseconds, that the replication worker waits before
fencing and
# replicating a ledger fragment that's still being written to upon bookie
failure.
# openLedgerRereplicationGracePeriod=30000
