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: fix data races in TestLDBStoreCollectGarbage

Browse source
This commit is contained in:
Janos Guljas 2019-01-16 16:33:54 +01:00
parent 4aeeecfded
commit be56353a0e
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
swarm/storage/ldbstore_test.go
View file

@ -388,7 +388,9 @@ func testLDBStoreCollectGarbage(t *testing.T) {
t.Fatal(err.Error()) t.Fatal(err.Error())
} }
allChunks = append(allChunks, chunks...) allChunks = append(allChunks, chunks...)
ldb.lock.Lock()
log.Debug("ldbstore", "entrycnt", ldb.entryCnt, "accesscnt", ldb.accessCnt, "cap", capacity, "n", n) log.Debug("ldbstore", "entrycnt", ldb.entryCnt, "accesscnt", ldb.accessCnt, "cap", capacity, "n", n)
ldb.lock.Unlock()
ctx, cancel := context.WithTimeout(context.Background(), time.Second*10) ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
defer cancel() defer cancel()
@ -537,7 +539,9 @@ func testLDBStoreRemoveThenCollectGarbage(t *testing.T) {
remaining -= putCount remaining -= putCount
for putCount > 0 { for putCount > 0 {
ldb.Put(context.TODO(), chunks[puts]) ldb.Put(context.TODO(), chunks[puts])
ldb.lock.Lock()
log.Debug("ldbstore", "entrycnt", ldb.entryCnt, "accesscnt", ldb.accessCnt, "cap", capacity, "n", n, "puts", puts, "remaining", remaining, "roundtarget", roundTarget) log.Debug("ldbstore", "entrycnt", ldb.entryCnt, "accesscnt", ldb.accessCnt, "cap", capacity, "n", n, "puts", puts, "remaining", remaining, "roundtarget", roundTarget)
ldb.lock.Unlock()
puts++ puts++
putCount-- putCount--
} }