update

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>
pingcap · Feb 5, 2025 · a3c775d · a3c775d
1 parent a0c00f8
commit a3c775d
Showing 1 changed file with 0 additions and 13 deletions.
diff --git a/domain/domain.go b/domain/domain.go
@@ -2042,25 +2042,17 @@ 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()
 		loadFeedbackTicker.Stop()
 		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()