tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

swarm/storage: fix influxdb gc metrics report (#19102)

Browse Source
This commit is contained in:
Elad 2019-02-15 13:41:42 +07:00 committed by Viktor Trón
parent 7f6b05aa43
commit 5b8ae7885e
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
swarm/storage/ldbstore.go
View File

@ -317,7 +317,6 @@ func decodeData(addr Address, data []byte) (*chunk, error) {
} }
func (s *LDBStore) collectGarbage() error { func (s *LDBStore) collectGarbage() error {
// prevent duplicate gc from starting when one is already running // prevent duplicate gc from starting when one is already running
select { select {
case <-s.gc.runC: case <-s.gc.runC:
@ -335,7 +334,6 @@ func (s *LDBStore) collectGarbage() error {
s.startGC(int(entryCnt)) s.startGC(int(entryCnt))
log.Debug("collectGarbage", "target", s.gc.target, "entryCnt", entryCnt) log.Debug("collectGarbage", "target", s.gc.target, "entryCnt", entryCnt)
var totalDeleted int
for s.gc.count < s.gc.target { for s.gc.count < s.gc.target {
it := s.db.NewIterator() it := s.db.NewIterator()
ok := it.Seek([]byte{keyGCIdx}) ok := it.Seek([]byte{keyGCIdx})
@ -371,15 +369,15 @@ func (s *LDBStore) collectGarbage() error {
} }
s.writeBatch(s.gc.batch, wEntryCnt) s.writeBatch(s.gc.batch, wEntryCnt)
log.Trace("garbage collect batch done", "batch", singleIterationCount, "total", s.gc.count)
s.lock.Unlock() s.lock.Unlock()
it.Release() it.Release()
log.Trace("garbage collect batch done", "batch", singleIterationCount, "total", s.gc.count)
} }
s.gc.runC <- struct{}{} metrics.GetOrRegisterCounter("ldbstore.collectgarbage.delete", nil).Inc(int64(s.gc.count))
log.Debug("garbage collect done", "c", s.gc.count) log.Debug("garbage collect done", "c", s.gc.count)
s.gc.runC <- struct{}{}
metrics.GetOrRegisterCounter("ldbstore.collectgarbage.delete", nil).Inc(int64(totalDeleted))
return nil return nil
} }