fix(core/txpool/locals): close journal under lock in Stop to fix data race #35096 - #2539
Open
gzliudan wants to merge 1 commit into
Open
fix(core/txpool/locals): close journal under lock in Stop to fix data race #35096#2539gzliudan wants to merge 1 commit into
gzliudan wants to merge 1 commit into
Conversation
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: defaults Review profile: CHILL Plan: Pro Plus Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
wanwiset25
approved these changes
Aug 23, 2026
gzliudan
force-pushed
the
port-geth-35096-locals-fix-data-race
branch
from
August 23, 2026 15:32
ab760d7 to
b512a45
Compare
… race ethereum#35096 Port go-ethereum PR ethereum#35096. Move journal.close() from the loop goroutine's deferred call into Stop(), guarded by tracker.mu, so the journal is deterministically closed after wg.Wait() instead of racing with concurrent Track/TrackAll access during shutdown. The load/setupWriter half was already present in Start() on dev-upgrade.
gzliudan
force-pushed
the
port-geth-35096-locals-fix-data-race
branch
from
August 24, 2026 10:52
b512a45 to
141352c
Compare
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
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.
Description
The local tx tracker's journal was previously closed inside the
loop()goroutine via adefer. Because the journal can still be accessed concurrently byTrack/TrackAllduring shutdown, this created a data race on the underlying journal writer.This change moves
journal.close()out of the goroutine and intoStop(), where it runs deterministically aftertracker.wg.Wait()and is guarded bytracker.mu.Note: on
dev-upgradethe load/setupWriter half of upstream PR ethereum#35096 was already present inStart()(journal is loaded and the writer is set up before the goroutine starts), so only the close-relocation half is ported here.Ref: ethereum#35096