From a3c775d6e635cf8861538692db9a3f125f8d40d7 Mon Sep 17 00:00:00 2001 From: Weizhen Wang Date: Wed, 5 Feb 2025 14:59:32 +0800 Subject: [PATCH] update Signed-off-by: Weizhen Wang --- domain/domain.go | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/domain/domain.go b/domain/domain.go index 3ab03cb65bf4e..98dcc6ecfad03 100644 --- a/domain/domain.go +++ b/domain/domain.go @@ -2042,12 +2042,8 @@ func (do *Domain) updateStatsWorker(ctx sessionctx.Context, owner owner.Manager) loadFeedbackTicker := time.NewTicker(5 * lease) loadLockedTablesTicker := time.NewTicker(5 * lease) dumpColStatsUsageTicker := time.NewTicker(100 * lease) -<<<<<<< HEAD:domain/domain.go - readMemTricker := time.NewTicker(memory.ReadMemInterval) -======= updateStatsHealthyTicker := time.NewTicker(20 * lease) readMemTicker := time.NewTicker(memory.ReadMemInterval) ->>>>>>> 0d5e0e921f6 (domain: move UpdateStatsHealthyMetrics into updateStatsWorker (#55386)):pkg/domain/domain.go statsHandle := do.StatsHandle() defer func() { dumpColStatsUsageTicker.Stop() @@ -2055,12 +2051,8 @@ func (do *Domain) updateStatsWorker(ctx sessionctx.Context, owner owner.Manager) dumpFeedbackTicker.Stop() gcStatsTicker.Stop() deltaUpdateTicker.Stop() -<<<<<<< HEAD:domain/domain.go - readMemTricker.Stop() -======= readMemTicker.Stop() updateStatsHealthyTicker.Stop() ->>>>>>> 0d5e0e921f6 (domain: move UpdateStatsHealthyMetrics into updateStatsWorker (#55386)):pkg/domain/domain.go do.SetStatsUpdating(false) logutil.BgLogger().Info("updateStatsWorker exited.") }() @@ -2108,12 +2100,7 @@ func (do *Domain) updateStatsWorker(ctx sessionctx.Context, owner owner.Manager) if err != nil { logutil.BgLogger().Debug("dump column stats usage failed", zap.Error(err)) } -<<<<<<< HEAD:domain/domain.go - - case <-readMemTricker.C: -======= case <-readMemTicker.C: ->>>>>>> 0d5e0e921f6 (domain: move UpdateStatsHealthyMetrics into updateStatsWorker (#55386)):pkg/domain/domain.go memory.ForceReadMemStats() case <-updateStatsHealthyTicker.C: statsHandle.UpdateStatsHealthyMetrics()