Skip to content

Commit

Permalink
ethdb/pebble: don't double-close iterator inside pebbleIterator (#28566)
Browse files Browse the repository at this point in the history
Adds 'released' flag to pebbleIterator to avoid double closing cockroachdb/pebble.Iterator as it is an invalid operation.

Fixes #28565
  • Loading branch information
magicxyyz committed Nov 21, 2023
1 parent 146e8d9 commit 6489a0d
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions ethdb/pebble/pebble.go
Original file line number Diff line number Diff line change
Expand Up @@ -609,9 +609,12 @@ func (b *batch) Replay(w ethdb.KeyValueWriter) error {

// pebbleIterator is a wrapper of underlying iterator in storage engine.
// The purpose of this structure is to implement the missing APIs.
//
// The pebble iterator is not thread-safe.
type pebbleIterator struct {
iter *pebble.Iterator
moved bool
iter *pebble.Iterator
moved bool
released bool
}

// NewIterator creates a binary-alphabetical iterator over a subset
Expand All @@ -623,7 +626,7 @@ func (d *Database) NewIterator(prefix []byte, start []byte) ethdb.Iterator {
UpperBound: upperBound(prefix),
})
iter.First()
return &pebbleIterator{iter: iter, moved: true}
return &pebbleIterator{iter: iter, moved: true, released: false}
}

// Next moves the iterator to the next key/value pair. It returns whether the
Expand Down Expand Up @@ -658,4 +661,9 @@ func (iter *pebbleIterator) Value() []byte {

// Release releases associated resources. Release should always succeed and can
// be called multiple times without causing error.
func (iter *pebbleIterator) Release() { iter.iter.Close() }
func (iter *pebbleIterator) Release() {
if !iter.released {
iter.iter.Close()
iter.released = true
}
}

0 comments on commit 6489a0d

Please sign in to comment.