QSP10, QSP11 - Add proper locking #6350
Merged
Conversation
This file contains 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
61 tasks
|
Perhaps consider #6326 instead of the proposed changes to the state here, as they cover a wider range of fixes. |
It seems like #6326 will be taking longer to merge and maybe experimental. (e.g. feature flag was requested) I say we merge this first (lower risk) then default to #6326 after more testing there |
prestonvanloon
requested changes
Jun 23, 2020
| @@ -345,6 +352,10 @@ func (b *BeaconState) Eth1DataVotes() []*ethpb.Eth1Data { | |||
| if b.state.Eth1DataVotes == nil { | |||
| return nil | |||
| } | |||
|
|
|||
| b.lock.RLock() | |||
There was a problem hiding this comment.
This needs to go before we read b.state.Eth1DataVotes
| @@ -413,13 +428,13 @@ func (b *BeaconState) ValidatorAtIndex(idx uint64) (*ethpb.Validator, error) { | |||
| if b.state.Validators == nil { | |||
| return ðpb.Validator{}, nil | |||
| } | |||
| if uint64(len(b.state.Validators)) <= idx { | |||
| return nil, fmt.Errorf("index %d out of range", idx) | |||
| } | |||
|
|
|||
| b.lock.RLock() | |||
There was a problem hiding this comment.
This needs to go before we read b.state.Validators.
| @@ -155,11 +155,11 @@ func (b *BeaconState) UpdateStateRootAtIndex(idx uint64, stateRoot [32]byte) err | |||
| if !b.HasInnerState() { | |||
| return ErrNilInnerState | |||
| } | |||
| b.lock.RLock() | |||
| if len(b.state.StateRoots) <= int(idx) { | |||
| return errors.Errorf("invalid index provided %d", idx) | |||
There was a problem hiding this comment.
You need to unlock in this branch now
beacon-chain/state/setters.go
Outdated
| @@ -174,7 +175,6 @@ func (b *BeaconState) UpdateStateRootAtIndex(idx uint64, stateRoot [32]byte) err | |||
| ref.MinusRef() | |||
| b.sharedFieldReferences[stateRoots] = &reference{refs: 1} | |||
| } | |||
| b.lock.RUnlock() | |||
prestonvanloon
approved these changes
Jun 23, 2020
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.
What type of PR is this?
What does this PR do? Why is it needed?
Addressed locking related feedbacks from Audit report. They are qsp10 and qsp11
Which issues(s) does this PR fix?
Part of #6327