Merge pull request #12303 from ptabor/20200915-v3compactor-metric-reporting

etcdserver: v3compactor should use proper clock for latency (took) reporting
This commit is contained in:
Jingyi Hu
2020-09-17 02:26:56 -07:00
committed by GitHub

View File

@@ -136,13 +136,14 @@ func (pc *Periodic) Run() {
zap.Int64("revision", rev),
zap.Duration("compact-period", pc.period),
)
startTime := pc.clock.Now()
_, err := pc.c.Compact(pc.ctx, &pb.CompactionRequest{Revision: rev})
if err == nil || err == mvcc.ErrCompacted {
pc.lg.Info(
"completed auto periodic compaction",
zap.Int64("revision", rev),
zap.Duration("compact-period", pc.period),
zap.Duration("took", time.Since(lastSuccess)),
zap.Duration("took", pc.clock.Now().Sub(startTime)),
)
lastSuccess = pc.clock.Now()
} else {