Skip to content

bor: fix race in LockedMilestoneIDs access #11139

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

Merged
AskAlexSharov merged 1 commit into from
Jul 13, 2024
Merged

bor: fix race in LockedMilestoneIDs access #11139

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
11 changes: 5 additions & 6 deletions polygon/bor/finality/whitelist/milestone.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@
package whitelist

import (
"github.com/ledgerwatch/erigon-lib/log/v3"

"github.com/ledgerwatch/erigon-lib/common"
"github.com/ledgerwatch/erigon-lib/log/v3"
"github.com/ledgerwatch/erigon-lib/metrics"
"github.com/ledgerwatch/erigon/core/types"
"github.com/ledgerwatch/erigon/polygon/bor/finality/flags"
Expand Down Expand Up @@ -172,8 +171,8 @@ func (m *milestone) UnlockSprint(endBlockNum uint64) {
m.Locked = false

m.purgeMilestoneIDsList()

err := rawdb.WriteLockField(m.db, m.Locked, m.LockedMilestoneNumber, m.LockedMilestoneHash, m.LockedMilestoneIDs)
purgedMilestoneIDs := map[string]struct{}{}
err := rawdb.WriteLockField(m.db, m.Locked, m.LockedMilestoneNumber, m.LockedMilestoneHash, purgedMilestoneIDs)

if err != nil {
log.Error("[bor] Error in writing lock data of milestone to db", "err", err)
Expand Down Expand Up @@ -274,8 +273,8 @@ func (m *milestone) ProcessFutureMilestone(num uint64, hash common.Hash) {

m.Locked = false
m.purgeMilestoneIDsList()

err := rawdb.WriteLockField(m.db, m.Locked, m.LockedMilestoneNumber, m.LockedMilestoneHash, m.LockedMilestoneIDs)
purgedMilestoneIDs := map[string]struct{}{}
err := rawdb.WriteLockField(m.db, m.Locked, m.LockedMilestoneNumber, m.LockedMilestoneHash, purgedMilestoneIDs)

if err != nil {
log.Error("[bor] Error in writing lock data of milestone to db", "err", err)
Expand Down