*: fix setHeapProfileTracker panic on Windows (#17226)

This commit is contained in:
Jack Yu
2020-05-18 22:16:45 +08:00
committed by GitHub
parent ac30f5322e
commit 4a67c3a43c
2 changed files with 5 additions and 4 deletions

View File

@ -175,8 +175,8 @@ func main() {
}
setGlobalVars()
setCPUAffinity()
setHeapProfileTracker()
setupLog()
setHeapProfileTracker()
setupTracing() // Should before createServer and after setup config.
printInfo()
setupBinlogClient()

View File

@ -16,8 +16,9 @@ package profile
import (
"time"
"github.com/pingcap/log"
"github.com/pingcap/tidb/util/kvcache"
log "github.com/sirupsen/logrus"
"go.uber.org/zap"
)
var col = &Collector{}
@ -32,7 +33,7 @@ func HeapProfileForGlobalMemTracker(d time.Duration) {
case <-t.C:
err := heapProfileForGlobalMemTracker()
if err != nil {
log.Warnf("profile memory into tracker failed, err: %v", err)
log.Warn("profile memory into tracker failed", zap.Error(err))
}
}
}
@ -45,7 +46,7 @@ func heapProfileForGlobalMemTracker() error {
}
defer func() {
if p := recover(); p != nil {
log.Warnf("GlobalLRUMemUsageTracker meet panic: %s", p)
log.Error("GlobalLRUMemUsageTracker meet panic", zap.Any("panic", p), zap.Stack("stack"))
}
}()
kvcache.GlobalLRUMemUsageTracker.ReplaceBytesUsed(bytes)