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

Jump to bottom

core/state/snapshot: acquire the lock on Release #30011

Merged
merged 2 commits into from
Jun 18, 2024
Merged

core/state/snapshot: acquire the lock on Release #30011

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c8dc88
core/state/snapshot: acquire the lock on release
MariusVanDerWijden Jun 17, 2024
4579ef9
core/state/snapshot: only acquire read-lock when iterating
MariusVanDerWijden Jun 17, 2024
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
3 changes: 3 additions & 0 deletions core/state/snapshot/snapshot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,6 +666,9 @@ func diffToDisk(bottom *diffLayer) *diskLayer {

// Release releases resources
func (t *Tree) Release() {
t.lock.Lock()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please change it to RLock, as we only iterate the layer map

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess same for generating and DiskRoot

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep, thanks!

defer t.lock.Unlock()

if dl := t.disklayer(); dl != nil {
dl.Release()
}
Expand Down