This is an automated email from the ASF dual-hosted git repository.
mmerli 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 8d922634c7 Fixed locking of PendingAddOp (#3806)
8d922634c7 is described below
commit 8d922634c71ac96daeb2fa7db7692424895df722
Author: Matteo Merli <[email protected]>
AuthorDate: Sun Feb 26 11:10:52 2023 -0800
Fixed locking of PendingAddOp (#3806)
* Fixed locking of PendingAddOp
* Fixed stack overflow
* Fixed stack overflow in different point
---
.../src/main/java/org/apache/bookkeeper/client/LedgerHandle.java | 3 ++-
.../src/main/java/org/apache/bookkeeper/client/PendingAddOp.java | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java
index 04270c72f5..ea5295dc7a 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java
@@ -1870,7 +1870,8 @@ public class LedgerHandle implements WriteHandle {
LOG.debug("Ensemble change is disabled. Retry sending to
failed bookies {} for ledger {}.",
failedBookies, ledgerId);
}
- unsetSuccessAndSendWriteRequest(getCurrentEnsemble(),
failedBookies.keySet());
+ executeOrdered(() ->
+ unsetSuccessAndSendWriteRequest(getCurrentEnsemble(),
failedBookies.keySet()));
return;
}
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/PendingAddOp.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/PendingAddOp.java
index 8dc5037019..3a78696e88 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/PendingAddOp.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/PendingAddOp.java
@@ -231,7 +231,7 @@ class PendingAddOp implements WriteCallback {
/**
* Initiate the add operation.
*/
- public void initiate() {
+ public synchronized void initiate() {
hasRun = true;
if (callbackTriggered) {
// this should only be true if the request was failed due
@@ -452,7 +452,7 @@ class PendingAddOp implements WriteCallback {
}
- private void maybeRecycle() {
+ private synchronized void maybeRecycle() {
/**
* We have opportunity to recycle two objects here.
* PendingAddOp#toSend and LedgerHandle#pendingAddOp
@@ -482,7 +482,7 @@ class PendingAddOp implements WriteCallback {
}
}
- public void recyclePendAddOpObject() {
+ public synchronized void recyclePendAddOpObject() {
entryId = LedgerHandle.INVALID_ENTRY_ID;
currentLedgerLength = -1;
if (payload != null) {