Skip to content

fix: panic: sync: unlock of unlocked mutex #1106

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: panic: sync: unlock of unlocked mutex #1106

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### Bug Fixes

- [#1007](https://github.com/cosmos/iavl/pull/1007) Add the extra check for the reformatted root node in `GetNode`
- [#1106](https://github.com/cosmos/iavl/pull/1106) Fix unlock of unlocked mutex panic.

### Improvements

Expand Down
20 changes: 10 additions & 10 deletions batch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,9 @@ func (b *BatchWithFlusher) Set(key, value []byte) error {
return err
}
if batchSizeAfter > b.flushThreshold {
b.mtx.Unlock()
if err := b.Write(); err != nil {
if err := b.write(); err != nil {
return err
}
b.mtx.Lock()
}
return b.batch.Set(key, value)
}
Expand All @@ -79,19 +77,14 @@ func (b *BatchWithFlusher) Delete(key []byte) error {
return err
}
if batchSizeAfter > b.flushThreshold {
b.mtx.Unlock()
if err := b.Write(); err != nil {
if err := b.write(); err != nil {
return err
}
b.mtx.Lock()
}
return b.batch.Delete(key)
}

func (b *BatchWithFlusher) Write() error {
b.mtx.Lock()
defer b.mtx.Unlock()

func (b *BatchWithFlusher) write() error {
if err := b.batch.Write(); err != nil {
return err
}
Expand All @@ -102,6 +95,13 @@ func (b *BatchWithFlusher) Write() error {
return nil
}

func (b *BatchWithFlusher) Write() error {
b.mtx.Lock()
defer b.mtx.Unlock()

return b.write()
}

func (b *BatchWithFlusher) WriteSync() error {
b.mtx.Lock()
defer b.mtx.Unlock()
Expand Down