You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by ch...@apache.org on 2023/02/09 01:25:19 UTC
[bookkeeper] branch branch-4.14 updated (5ce2fe814c -> 05b1906eb9)
This is an automated email from the ASF dual-hosted git repository.
chenhang pushed a change to branch branch-4.14
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
from 5ce2fe814c upgrade python client version to 4.14.7
new 9d97e434c7 Add missed call to onReadRequestFinish() when read request rejected (#3482)
new 05b1906eb9 Check if channel closed before processing read request (#3486)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/bookkeeper/proto/BookieRequestProcessor.java | 2 ++
.../main/java/org/apache/bookkeeper/proto/ReadEntryProcessor.java | 7 +++++++
.../java/org/apache/bookkeeper/proto/ReadEntryProcessorV3.java | 7 +++++++
.../org/apache/bookkeeper/proto/ForceLedgerProcessorV3Test.java | 1 +
.../apache/bookkeeper/proto/LongPollReadEntryProcessorV3Test.java | 1 +
.../java/org/apache/bookkeeper/proto/ReadEntryProcessorTest.java | 1 +
.../java/org/apache/bookkeeper/proto/WriteEntryProcessorTest.java | 1 +
.../org/apache/bookkeeper/proto/WriteEntryProcessorV3Test.java | 1 +
8 files changed, 21 insertions(+)
[bookkeeper] 01/02: Add missed call to onReadRequestFinish() when read request rejected (#3482)
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chenhang pushed a commit to branch branch-4.14
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
commit 9d97e434c7f9fd96365459754c18cfb7bd4b97eb
Author: Michael Marshall <mm...@apache.org>
AuthorDate: Sun Sep 11 23:57:08 2022 -0700
Add missed call to onReadRequestFinish() when read request rejected (#3482)
Fixes: https://github.com/apache/bookkeeper/issues/2945
### Motivation
When a read request is rejected due to the limit on the number of reads that can be enqueued, we need to decrement the metric for `bookkeeper_server_READ_ENTRY_IN_PROGRESS` and release the `readsSemaphore`, if it is not null.
### Changes
* Call `onReadRequestFinish()` for failures in the V2 and V3 request processing logic.
### Observation
It looks like the V2 responses for this kind of failure are not throttled, even when `throttleReadResponses` is true. We could call `read.sendReadReqResponse(` to enable this throttling. I didn't change it here because there might be a reason we're not throttling these small responses.
(cherry picked from commit 6fa13ecdfca01d4d65d49c489484acc5755e616e)
---
.../main/java/org/apache/bookkeeper/proto/BookieRequestProcessor.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieRequestProcessor.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieRequestProcessor.java
index 2223274882..d34ce3c9da 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieRequestProcessor.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieRequestProcessor.java
@@ -540,6 +540,7 @@ public class BookieRequestProcessor implements RequestProcessor {
.setReadResponse(readResponse);
BookkeeperProtocol.Response resp = response.build();
read.sendResponse(readResponse.getStatus(), resp, requestStats.getReadRequestStats());
+ onReadRequestFinish();
}
}
}
@@ -676,6 +677,7 @@ public class BookieRequestProcessor implements RequestProcessor {
BookieProtocol.ETOOMANYREQUESTS,
ResponseBuilder.buildErrorResponse(BookieProtocol.ETOOMANYREQUESTS, r),
requestStats.getReadRequestStats());
+ onReadRequestFinish();
}
}
}
[bookkeeper] 02/02: Check if channel closed before processing read request (#3486)
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chenhang pushed a commit to branch branch-4.14
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
commit 05b1906eb9b4534eb4516c5220d7c2601e8fa60c
Author: Michael Marshall <mm...@apache.org>
AuthorDate: Mon Sep 19 02:57:51 2022 -0700
Check if channel closed before processing read request (#3486)
* Check if channel closed before processing read request
* Add missed call to onReadRequestFinish()
* Fix test
* Mock more tests
Co-authored-by: Nicolò Boschi <bo...@gmail.com>
(cherry picked from commit 1313b8e2e7964a0bbf2e221f49fe30a1fd812d31)
---
.../main/java/org/apache/bookkeeper/proto/ReadEntryProcessor.java | 7 +++++++
.../java/org/apache/bookkeeper/proto/ReadEntryProcessorV3.java | 7 +++++++
.../org/apache/bookkeeper/proto/ForceLedgerProcessorV3Test.java | 1 +
.../apache/bookkeeper/proto/LongPollReadEntryProcessorV3Test.java | 1 +
.../java/org/apache/bookkeeper/proto/ReadEntryProcessorTest.java | 1 +
.../java/org/apache/bookkeeper/proto/WriteEntryProcessorTest.java | 1 +
.../org/apache/bookkeeper/proto/WriteEntryProcessorV3Test.java | 1 +
7 files changed, 19 insertions(+)
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadEntryProcessor.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadEntryProcessor.java
index 60de0440c1..7647e4afef 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadEntryProcessor.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadEntryProcessor.java
@@ -65,6 +65,13 @@ class ReadEntryProcessor extends PacketProcessorBase<ReadRequest> {
if (LOG.isDebugEnabled()) {
LOG.debug("Received new read request: {}", request);
}
+ if (!channel.isOpen()) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Dropping read request for closed channel: {}", channel);
+ }
+ requestProcessor.onReadRequestFinish();
+ return;
+ }
int errorCode = BookieProtocol.EOK;
long startTimeNanos = MathUtils.nowInNano();
ByteBuf data = null;
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadEntryProcessorV3.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadEntryProcessorV3.java
index a8ecc11d7e..6b3b624141 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadEntryProcessorV3.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/ReadEntryProcessorV3.java
@@ -248,6 +248,13 @@ class ReadEntryProcessorV3 extends PacketProcessorBaseV3 {
public void safeRun() {
requestProcessor.getRequestStats().getReadEntrySchedulingDelayStats().registerSuccessfulEvent(
MathUtils.elapsedNanos(enqueueNanos), TimeUnit.NANOSECONDS);
+ if (!channel.isOpen()) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Dropping read request for closed channel: {}", channel);
+ }
+ requestProcessor.onReadRequestFinish();
+ return;
+ }
if (!isVersionCompatible()) {
ReadResponse readResponse = ReadResponse.newBuilder()
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/ForceLedgerProcessorV3Test.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/ForceLedgerProcessorV3Test.java
index 1b07fbb4d1..ecb2676bc8 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/ForceLedgerProcessorV3Test.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/ForceLedgerProcessorV3Test.java
@@ -71,6 +71,7 @@ public class ForceLedgerProcessorV3Test {
.build())
.build();
channel = mock(Channel.class);
+ when(channel.isOpen()).thenReturn(true);
bookie = mock(Bookie.class);
requestProcessor = mock(BookieRequestProcessor.class);
when(requestProcessor.getBookie()).thenReturn(bookie);
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/LongPollReadEntryProcessorV3Test.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/LongPollReadEntryProcessorV3Test.java
index 393d5ddf33..9eae1b9c0d 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/LongPollReadEntryProcessorV3Test.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/LongPollReadEntryProcessorV3Test.java
@@ -83,6 +83,7 @@ public class LongPollReadEntryProcessorV3Test {
.build();
Channel channel = mock(Channel.class);
+ when(channel.isOpen()).thenReturn(true);
Bookie bookie = mock(Bookie.class);
BookieRequestProcessor requestProcessor = mock(BookieRequestProcessor.class);
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/ReadEntryProcessorTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/ReadEntryProcessorTest.java
index fcd74b1705..1fd42fd16f 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/ReadEntryProcessorTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/ReadEntryProcessorTest.java
@@ -60,6 +60,7 @@ public class ReadEntryProcessorTest {
@Before
public void setup() throws IOException, BookieException {
channel = mock(Channel.class);
+ when(channel.isOpen()).thenReturn(true);
bookie = mock(Bookie.class);
requestProcessor = mock(BookieRequestProcessor.class);
when(requestProcessor.getBookie()).thenReturn(bookie);
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/WriteEntryProcessorTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/WriteEntryProcessorTest.java
index f6cd11ba2a..3ed939b796 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/WriteEntryProcessorTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/WriteEntryProcessorTest.java
@@ -67,6 +67,7 @@ public class WriteEntryProcessorTest {
new byte[0],
Unpooled.wrappedBuffer("test-entry-data".getBytes(UTF_8)));
channel = mock(Channel.class);
+ when(channel.isOpen()).thenReturn(true);
bookie = mock(Bookie.class);
requestProcessor = mock(BookieRequestProcessor.class);
when(requestProcessor.getBookie()).thenReturn(bookie);
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/WriteEntryProcessorV3Test.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/WriteEntryProcessorV3Test.java
index 3c81d73a5e..2175b26a5b 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/WriteEntryProcessorV3Test.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/proto/WriteEntryProcessorV3Test.java
@@ -77,6 +77,7 @@ public class WriteEntryProcessorV3Test {
.build())
.build();
channel = mock(Channel.class);
+ when(channel.isOpen()).thenReturn(true);
bookie = mock(Bookie.class);
requestProcessor = mock(BookieRequestProcessor.class);
when(requestProcessor.getBookie()).thenReturn(bookie);