george.bartolomey/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

[#598] Fix use-after-close bug in badger writecache

Browse source 
Signed-off-by: Alejandro Lopez <a.lopez@yadro.com>
This commit is contained in:
Alejandro Lopez 2023-08-14 10:54:09 +03:00 committed by Evgenii Stratonikov
parent ae8be495c8
commit 88b6755c5e
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkg/local_object_storage/writecache/writecachebadger/flush.go
View file

@ -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()

8
pkg/local_object_storage/writecache/writecachebadger/gc.go
View file

@ -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 {