Skip to content

Commit

Permalink
swarm/storage: fix influxdb gc metrics report (#19102)
Browse files Browse the repository at this point in the history
  • Loading branch information
acud authored and zelig committed Feb 15, 2019
1 parent 7f6b05a commit 5b8ae78
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions swarm/storage/ldbstore.go
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,6 @@ func decodeData(addr Address, data []byte) (*chunk, error) {
}

func (s *LDBStore) collectGarbage() error {

// prevent duplicate gc from starting when one is already running
select {
case <-s.gc.runC:
Expand All @@ -335,7 +334,6 @@ func (s *LDBStore) collectGarbage() error {
s.startGC(int(entryCnt))
log.Debug("collectGarbage", "target", s.gc.target, "entryCnt", entryCnt)

var totalDeleted int
for s.gc.count < s.gc.target {
it := s.db.NewIterator()
ok := it.Seek([]byte{keyGCIdx})
Expand Down Expand Up @@ -371,15 +369,15 @@ func (s *LDBStore) collectGarbage() error {
}

s.writeBatch(s.gc.batch, wEntryCnt)
log.Trace("garbage collect batch done", "batch", singleIterationCount, "total", s.gc.count)
s.lock.Unlock()
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)
s.gc.runC <- struct{}{}

metrics.GetOrRegisterCounter("ldbstore.collectgarbage.delete", nil).Inc(int64(totalDeleted))
return nil
}

Expand Down

0 comments on commit 5b8ae78

Please sign in to comment.