Address review comments

cmd/data-scanner-metric.go

@@ -249,7 +249,7 @@ func (p *scannerMetrics) lastMinuteActions(a lifecycle.Action) AccElem {
  return val
 }
 
-// addCycleEvent updates the current cycle metrics.
+// bucketScanStarted updates the cycle count of the given bucket.
 func (p *scannerMetrics) bucketScanStarted(bucket string, cycle uint32) {
  p.cycleInfoMu.Lock()
  defer p.cycleInfoMu.Unlock()
@@ -279,7 +279,7 @@ type currentScannerCycle struct {
  current uint64
  ongoing bool
  started time.Time
- cycleCompleted []time.Time
+ cycleCompleted []time.Time // Last 10 completed cycles
 }
 
 // clone returns a clone.
@@ -288,8 +288,8 @@ func (z currentScannerCycle) clone() currentScannerCycle {
  return z
 }
 
-// getCycle returns the current cycle metrics.
-// If not nil, the returned value can safely be modified.
+// getCycles returns the current cycle metrics for all buckets
+// If not nil, the returned result can safely be modified.
 func (p *scannerMetrics) getCycles() map[string]currentScannerCycle {
  p.cycleInfoMu.Lock()
  defer p.cycleInfoMu.Unlock()

cmd/erasure.go

@@ -445,12 +445,14 @@ func (er erasureObjects) nsScanner(ctx context.Context, scanMgr *bucketsScanMgr,
  }
  }()
 
- // Restrict parallelism for disk usage scanner
- // upto GOMAXPROCS if GOMAXPROCS is < len(disks)
- cpuGuard := make(chan struct{}, runtime.GOMAXPROCS(0))
-
- scanWg := sync.WaitGroup{}
- scanID := er.poolIndex<<16 | er.setIndex
+ var (
+ // Restrict parallelism for disk usage scanner
+ // upto GOMAXPROCS if GOMAXPROCS is < len(disks)
+ cpuGuard = make(chan struct{}, runtime.GOMAXPROCS(0))
+
+ scanWg sync.WaitGroup
+ scanID = er.poolIndex<<16 | er.setIndex
+ )
 
  for bucket := range scanMgr.getBucketCh(scanID) {
  select {