[#598] Fix use-after-close bug in badger writecache
Signed-off-by: Alejandro Lopez <a.lopez@yadro.com>
This commit is contained in:
parent
ae8be495c8
commit
88b6755c5e
2 changed files with 15 additions and 0 deletions
|
@ -80,6 +80,13 @@ func (c *cache) flushSmallObjects() {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Using the db after Close will panic and badger won't wait for outstanding txs,
|
||||||
|
// so we need to check manually.
|
||||||
|
if c.db.IsClosed() {
|
||||||
|
c.modeMtx.RUnlock()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
_ = c.db.View(func(tx *badger.Txn) error {
|
_ = c.db.View(func(tx *badger.Txn) error {
|
||||||
it := tx.NewIterator(badger.DefaultIteratorOptions)
|
it := tx.NewIterator(badger.DefaultIteratorOptions)
|
||||||
defer it.Close()
|
defer it.Close()
|
||||||
|
|
|
@ -20,6 +20,14 @@ func (c *cache) runGCLoop() {
|
||||||
case <-c.closeCh:
|
case <-c.closeCh:
|
||||||
return
|
return
|
||||||
case <-t.C:
|
case <-t.C:
|
||||||
|
// This serves to synchronize the c.db field when changing mode as well.
|
||||||
|
c.modeMtx.RLock()
|
||||||
|
ro := c.readOnly()
|
||||||
|
c.modeMtx.RUnlock()
|
||||||
|
if ro {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
// 0.5 is the recommended value so that write amplification of the value log is 2.
|
// 0.5 is the recommended value so that write amplification of the value log is 2.
|
||||||
// See https://pkg.go.dev/github.com/dgraph-io/badger/v4#DB.RunValueLogGC for more info.
|
// See https://pkg.go.dev/github.com/dgraph-io/badger/v4#DB.RunValueLogGC for more info.
|
||||||
for c.db.RunValueLogGC(0.5) == nil {
|
for c.db.RunValueLogGC(0.5) == nil {
|
||||||
|
|
Loading…
Reference in a new issue