Skip to content

fix(core/txpool/locals): close journal under lock in Stop to fix data race #35096 #2539

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

Open
gzliudan wants to merge 1 commit into
base: dev-upgrade
Choose a base branch
from
Open

fix(core/txpool/locals): close journal under lock in Stop to fix data race #35096 #2539

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions core/txpool/locals/tx_tracker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@ func (tracker *TxTracker) Start() error {
}); err != nil {
log.Warn("Failed to load transaction journal", "err", err)
}

// Ensure the writer is ready before Start returns so Track/TrackAll can
// persist transactions immediately.
if err := tracker.journal.setupWriter(); err != nil {
Expand All @@ -197,13 +196,17 @@ func (tracker *TxTracker) Start() error {
func (tracker *TxTracker) Stop() error {
close(tracker.shutdownCh)
tracker.wg.Wait()
return nil
}

func (tracker *TxTracker) loop() {
tracker.mu.Lock()
var err error
if tracker.journal != nil {
defer tracker.journal.close()
err = tracker.journal.close()
}
tracker.mu.Unlock()
return err
}

func (tracker *TxTracker) loop() {
var (
lastJournal = time.Now()
timer = time.NewTimer(10 * time.Second) // Do initial check after 10 seconds, do rechecks more seldom.
Expand Down