Merge pull request #2157 from yichengq/309

pkg/metrics: protect global vars in reset func

pkg/metrics/metrics.go

@@ -158,6 +158,8 @@ func Do(f func(expvar.KeyValue)) {
 
 // for test only
 func reset() {
+	mutex.Lock()
+	defer mutex.Unlock()
 	vars = make(map[string]expvar.Var)
 	varKeys = nil
 }