Fix history prune scheduling #9677
Open
+164
−128
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…oid exceptions In HistoryPruner add checks before going into lock and doing pruning. In historyPruner make pruning task exclusive - don't schedule another before previous isn't finished.
Move CancelledToken out of generic type Specify channel options explicitly
LukaszRozmej
requested review from
Marchhill,
MarekM25,
asdacap,
flcl42 and
marcindsobczak
as code owners
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR refactors the IBackgroundTaskScheduler API to return a boolean success indicator instead of void, renaming ScheduleTask to TryScheduleTask. The changes also include refactoring of HistoryPruner to add concurrency control, spelling corrections, and related test updates.
Key Changes:
- Changed
ScheduleTasktoTryScheduleTaskwithboolreturn value across the codebase to indicate scheduling success/failure - Refactored
HistoryPruner.SchedulePruneHistoryto useTask.Runand added_currentlyPruningflag for concurrency control - Optimized
BackgroundTaskSchedulerby removing lock and using lock-free operations withInterlocked
Reviewed Changes
Copilot reviewed 10 out of 10 changed files in this pull request and generated 6 comments.
Show a summary per file
| File | Description |
|---|---|
| Nethermind.Consensus/Scheduler/IBackgroundTaskScheduler.cs | Updated interface signature to return bool |
| Nethermind.Consensus/Scheduler/BackgroundTaskScheduler.cs | Implemented TryScheduleTask, removed lock, improved documentation, moved CancelledToken to class level |
| Nethermind.Network/P2P/Utils/BackgroundTaskSchedulerWrapper.cs | Updated method calls to use TrySchedule* variants |
| Nethermind.Network/P2P/ProtocolHandlers/ProtocolHandlerBase.cs | Updated calls to wrapper methods |
| Nethermind.Network/P2P/Subprotocols/Eth/V62/Eth62ProtocolHandler.cs | Updated background task scheduling calls |
| Nethermind.History/HistoryPruner.cs | Added concurrency control, changed TryPruneHistory from Task to void, refactored logic, fixed typos |
| Nethermind.Consensus.Test/Scheduler/BackgroundTaskSchedulerTests.cs | Updated test calls to use TryScheduleTask |
| Nethermind.Network.Test/P2P/Subprotocols/Eth/V62/Eth62ProtocolHandlerTests.cs | Updated mock implementation to return bool |
| Nethermind.History.Test/HistoryPrunerTests.cs | Removed await from TryPruneHistory calls since it's now void |
| Nethermind.Core.Test/RunImmediatelyScheduler.cs | Updated test scheduler to return bool |
| { | ||
| bool lockTaken = false; | ||
| // take lock before updating delete pointer | ||
| // take lock before updating delete the pointer |
There was a problem hiding this comment.
Corrected spelling: "delete the pointer" should be "delete pointer"
Suggested change
| // take lock before updating delete the pointer | |
| // take lock before updating delete pointer |
src/Nethermind/Nethermind.Consensus/Scheduler/BackgroundTaskScheduler.cs
Outdated
Show resolved
Hide resolved
src/Nethermind/Nethermind.Consensus/Scheduler/BackgroundTaskScheduler.cs
Outdated
Show resolved
Hide resolved
src/Nethermind/Nethermind.Consensus/Scheduler/BackgroundTaskScheduler.cs
Show resolved
Hide resolved
benaadams
reviewed
Nov 10, 2025
src/Nethermind/Nethermind.Consensus/Scheduler/BackgroundTaskScheduler.cs
Outdated
Show resolved
Hide resolved
src/Nethermind/Nethermind.Consensus/Scheduler/BackgroundTaskScheduler.cs
Outdated
Show resolved
Hide resolved
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
src/Nethermind/Nethermind.Consensus/Scheduler/BackgroundTaskScheduler.cs
Outdated
Show resolved
Hide resolved
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
16 tasks
Contributor
|
@LukaszRozmej I've opened a new pull request, #9679, to work on those changes. Once the pull request is ready, I'll request review from you. |
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…heduler.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Marchhill
requested changes
Nov 10, 2025
| { | ||
| bool lockTaken = false; | ||
| // take lock before updating delete pointer | ||
| // take lock before updating delete the pointer |
Marchhill
reviewed
Nov 10, 2025
Marchhill
approved these changes
Nov 10, 2025
benaadams
approved these changes
Nov 11, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
BackgroundTaskScheduler.ScheduleTask->TryScheduleTaskand avoid exceptionsHistoryPruneradd checks before going into lock and doing pruning.HistoryPrunermake pruning task exclusive - don't schedule another before previous isn't finished.BackgroundTaskSchedulerCancelledTokenout of generic typeTypes of changes
What types of changes does your code introduce?
Testing
Requires testing
If yes, did you write tests?
Notes on testing
BackgroundTaskSchedulerwon't be throwing exceptions which can affect networking a bit?)