From e65a7e4ac6da1e05c326ce4d14b929fa60db8e5e Mon Sep 17 00:00:00 2001 From: Janos Guljas Date: Thu, 21 Feb 2019 23:05:31 +0100 Subject: [PATCH] swarm/storage/localstore: more correct testDB_collectGarbageWorker --- swarm/storage/localstore/gc.go | 2 +- swarm/storage/localstore/gc_test.go | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/swarm/storage/localstore/gc.go b/swarm/storage/localstore/gc.go index 50fbfe6fec..ebaba2d8f3 100644 --- a/swarm/storage/localstore/gc.go +++ b/swarm/storage/localstore/gc.go @@ -134,7 +134,7 @@ func (db *DB) collectGarbageWorker() { db.triggerGarbageCollection() } - if testHookCollectGarbage != nil { + if collectedCount > 0 && testHookCollectGarbage != nil { testHookCollectGarbage(collectedCount) } case <-db.close: diff --git a/swarm/storage/localstore/gc_test.go b/swarm/storage/localstore/gc_test.go index 5515d6dd2c..60309d7fa9 100644 --- a/swarm/storage/localstore/gc_test.go +++ b/swarm/storage/localstore/gc_test.go @@ -118,15 +118,6 @@ func testDB_collectGarbageWorker(t *testing.T) { t.Fatal(err) } }) - - // cleanup: drain the last testHookCollectGarbageChan - // element before calling deferred functions not to block - // collectGarbageWorker loop, preventing the race in - // setting testHookCollectGarbage function - select { - case <-testHookCollectGarbageChan: - default: - } } // TestDB_collectGarbageWorker_withRequests is a helper test function