Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correctly release txpool save and restore lock in case of exceptions #7473

Merged
merged 2 commits into from
Aug 16, 2024
Merged

Correctly release txpool save and restore lock in case of exceptions #7473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72a8409
Correctly release txpool save and restore lock in case of exceptions
fab-10 Aug 16, 2024
e2e786b
Merge branch 'main' into fix-release-disk-access-lock-on-tx-restore
garyschulte Aug 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
- Fix protocol schedule check for devnets [#7429](https://github.com/hyperledger/besu/pull/7429)
- Fix behaviour when starting in a pre-merge network [#7431](https://github.com/hyperledger/besu/pull/7431)
- Fix tracing in precompiled contracts when halting for out of gas [#7318](https://github.com/hyperledger/besu/issues/7318)
- Correctly release txpool save and restore lock in case of exceptions [#7473](https://github.com/hyperledger/besu/pull/7473)

## 24.7.1

Expand Down
3 changes: 2 additions & 1 deletion ...eum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/transactions/TransactionPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,8 @@ private CompletableFuture<Void> serializeAndDedupOperation(

isCancelled.set(false);
operationInProgress.set(
CompletableFuture.runAsync(operation).thenRun(diskAccessLock::release));
CompletableFuture.runAsync(operation)
.whenComplete((res, err) -> diskAccessLock.release()));
return operationInProgress.get();
} else {
CompletableFuture.failedFuture(
Expand Down
Loading