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

mpool: fix: data race when adding messages #10758

Closed
wants to merge 3 commits into from
Closed

mpool: fix: data race when adding messages #10758

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6249e9d
remove state nonce cache hack as state nonce is not safe anymore and …
snissn Apr 25, 2023
4bcb13a
change addTs to use GetActorBefore and remove cache hack
snissn Apr 25, 2023
d0b05a1
fix - deleted unused var
snissn Apr 25, 2023
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
24 changes: 1 addition & 23 deletions chain/messagepool/messagepool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,30 +764,8 @@ func (mp *MessagePool) Add(ctx context.Context, m *types.SignedMessage) error {
<-mp.addSema
}()

mp.curTsLk.RLock()
tmpCurTs := mp.curTs
mp.curTsLk.RUnlock()

//ensures computations are cached without holding lock
_, _ = mp.api.GetActorAfter(m.Message.From, tmpCurTs)
_, _ = mp.getStateNonce(ctx, m.Message.From, tmpCurTs)

mp.curTsLk.Lock()
if tmpCurTs == mp.curTs {
//with the lock enabled, mp.curTs is the same Ts as we just had, so we know that our computations are cached
} else {
//curTs has been updated so we want to cache the new one:
tmpCurTs = mp.curTs
//we want to release the lock, cache the computations then grab it again
mp.curTsLk.Unlock()
_, _ = mp.api.GetActorAfter(m.Message.From, tmpCurTs)
_, _ = mp.getStateNonce(ctx, m.Message.From, tmpCurTs)
mp.curTsLk.Lock()
//now that we have the lock, we continue, we could do this as a loop forever, but that's bad to loop forever, and this was added as an optimization and it seems once is enough because the computation < block time
}

defer mp.curTsLk.Unlock()

_, err = mp.addTs(ctx, m, mp.curTs, false, false)
return err
}
Expand Down Expand Up @@ -874,7 +852,7 @@ func (mp *MessagePool) addTs(ctx context.Context, m *types.SignedMessage, curTs
return false, xerrors.Errorf("minimum expected nonce is %d: %w", snonce, ErrNonceTooLow)
}

senderAct, err := mp.api.GetActorAfter(m.Message.From, curTs)
senderAct, err := mp.api.GetActorBefore(m.Message.From, curTs)
if err != nil {
return false, xerrors.Errorf("failed to get sender actor: %w", err)
}
Expand Down