cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

swarm/storage/localstore: fix synchronization in TestDB_gcSize (#19235)

Browse Source
This commit is contained in:
Janoš Guljaš 2019-03-08 05:59:59 +01:00 committed by Viktor Trón
parent 4687391213
commit a6e5c6a2cc
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
swarm/storage/localstore/gc_test.go
View File

@ -289,12 +289,9 @@ func TestDB_gcSize(t *testing.T) {
} }
// DB.Close writes gc size to disk, so // DB.Close writes gc size to disk, so
// Instead calling Close, simulate database shutdown // Instead calling Close, close the database
// without it. // without it.
close(db.close) if err := db.closeWithOptions(false); err != nil {
db.updateGCWG.Wait()
err = db.shed.Close()
if err != nil {
t.Fatal(err) t.Fatal(err)
} }

12
swarm/storage/localstore/localstore.go
View File

@ -367,6 +367,12 @@ func New(path string, baseKey []byte, o *Options) (db *DB, err error) {
// Close closes the underlying database. // Close closes the underlying database.
func (db *DB) Close() (err error) { func (db *DB) Close() (err error) {
return db.closeWithOptions(true)
}
// closeWithOptions provides a more control which part of closing
// is done for tests.
func (db *DB) closeWithOptions(writeGCSize bool) (err error) {
close(db.close) close(db.close)
db.updateGCWG.Wait() db.updateGCWG.Wait()
@ -384,8 +390,10 @@ func (db *DB) Close() (err error) {
log.Error("localstore: write gc size worker did not return after db close") log.Error("localstore: write gc size worker did not return after db close")
} }
if err := db.writeGCSize(db.getGCSize()); err != nil { if writeGCSize {
log.Error("localstore: write gc size", "err", err) if err := db.writeGCSize(db.getGCSize()); err != nil {
log.Error("localstore: write gc size", "err", err)
}
} }
return db.shed.Close() return db.shed.Close()
} }