forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 02:42:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

swarm/storage/localstore: correct useGlobalLock in collectGarbage

Browse source
This commit is contained in:
Janos Guljas 2019-01-28 11:09:14 +01:00
parent 6accc6bc4b
commit 85cd349af4
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
swarm/storage/localstore/gc.go
View file

@ -78,13 +78,15 @@ func (db *DB) collectGarbage() (collectedCount int64, done bool, err error) {
batch := new(leveldb.Batch) batch := new(leveldb.Batch)
target := db.gcTarget() target := db.gcTarget()
done = true
err = db.gcIndex.Iterate(func(item shed.Item) (stop bool, err error) {
// protect parallel updates
if db.useGlobalLock { if db.useGlobalLock {
db.globalMu.Lock() db.globalMu.Lock()
defer db.globalMu.Unlock() defer db.globalMu.Unlock()
} else { }
done = true
err = db.gcIndex.Iterate(func(item shed.Item) (stop bool, err error) {
// protect parallel updates
if !db.useGlobalLock {
unlock, err := db.lockAddr(item.Address) unlock, err := db.lockAddr(item.Address)
if err != nil { if err != nil {
return false, err return false, err