status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix race condition in `LDBDatabase.Close()` 

- https://jenkins.status.im/job/status-go/job/race-check/54/consoleFull
This commit is contained in:
Pedro Pombeiro 2018-05-03 10:03:42 +02:00 committed by Dmitry Shulyak
parent 04fa765daf
commit acbf251a3c
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
_assets/patches/geth/0026-ethdb-error-deadlock.patch
View File

@ -35,9 +35,20 @@ index 001d8f0bb..4c9b1412c 100644
- go db.meter(3 * time.Second) - go db.meter(3 * time.Second)
+ db.wg.Add(1) + db.wg.Add(1)
+ go func() { + go func() {
+ db.wg.Done() + defer db.wg.Done()
+ db.meter(3 * time.Second) + db.meter(3 * time.Second)
+ }() + }()
} }
// meter periodically retrieves internal leveldb counters and reports them to // meter periodically retrieves internal leveldb counters and reports them to
@@ -345,9 +347,8 @@ func (db *LDBDatabase) meter(refresh tim
// Sleep a bit, then repeat the stats collection
select {
- case errc := <-db.quitChan:
+ case <-db.quitChan:
// Quit requesting, stop hammering the database
- errc <- nil
return
case <-time.After(refresh):

5
vendor/github.com/ethereum/go-ethereum/ethdb/database.go generated vendored
View File

@ -173,7 +173,7 @@ func (db *LDBDatabase) Meter(prefix string) {
db.wg.Add(1) db.wg.Add(1)
go func() { go func() {
db.wg.Done() defer db.wg.Done()
db.meter(3 * time.Second) db.meter(3 * time.Second)
}() }()
} }
@ -347,9 +347,8 @@ func (db *LDBDatabase) meter(refresh time.Duration) {
// Sleep a bit, then repeat the stats collection // Sleep a bit, then repeat the stats collection
select { select {
case errc := <-db.quitChan: case <-db.quitChan:
// Quit requesting, stop hammering the database // Quit requesting, stop hammering the database
errc <- nil
return return
case <-time.After(refresh): case <-time.After(refresh):