*: kill auto analyze out of the auto analyze time windows (#55062) (#…

…55522)

close #55283

pkg/domain/BUILD.bazel

@@ -58,6 +58,7 @@ go_library(
         "//pkg/sessionctx/sysproctrack",
         "//pkg/sessionctx/variable",
         "//pkg/statistics/handle",
+        "//pkg/statistics/handle/autoanalyze",
         "//pkg/statistics/handle/logutil",
         "//pkg/statistics/handle/util",
         "//pkg/store/helper",

pkg/domain/domain.go

@@ -67,6 +67,7 @@ import (
 	"github.com/pingcap/tidb/pkg/sessionctx/sysproctrack"
 	"github.com/pingcap/tidb/pkg/sessionctx/variable"
 	"github.com/pingcap/tidb/pkg/statistics/handle"
+	"github.com/pingcap/tidb/pkg/statistics/handle/autoanalyze"
 	statslogutil "github.com/pingcap/tidb/pkg/statistics/handle/logutil"
 	"github.com/pingcap/tidb/pkg/store/helper"
 	"github.com/pingcap/tidb/pkg/ttl/ttlworker"
@@ -783,6 +784,22 @@ func (do *Domain) topologySyncerKeeper() {
 	}
 }
 
+// CheckAutoAnalyzeWindows checks the auto analyze windows and kill the auto analyze process if it is not in the window.
+func (do *Domain) CheckAutoAnalyzeWindows() {
+	se, err := do.sysSessionPool.Get()
+
+	if err != nil {
+		logutil.BgLogger().Warn("get system session failed", zap.Error(err))
+		return
+	}
+	// Make sure the session is new.
+	sctx := se.(sessionctx.Context)
+	defer do.sysSessionPool.Put(se)
+	if !autoanalyze.CheckAutoAnalyzeWindow(sctx) {
+		do.SysProcTracker().KillSysProcess(do.GetAutoAnalyzeProcID())
+	}
+}
+
 func (do *Domain) refreshMDLCheckTableInfo() {
 	se, err := do.sysSessionPool.Get()
 
@@ -2446,6 +2463,7 @@ func (do *Domain) updateStatsWorker(_ sessionctx.Context, owner owner.Manager) {
 			if err != nil {
 				logutil.BgLogger().Debug("GC stats failed", zap.Error(err))
 			}
+			do.CheckAutoAnalyzeWindows()
 		case <-dumpColStatsUsageTicker.C:
 			err := statsHandle.DumpColStatsUsageToKV()
 			if err != nil {

pkg/statistics/handle/autoanalyze/autoanalyze.go

@@ -287,21 +287,11 @@ func HandleAutoAnalyze(
 
 	parameters := exec.GetAutoAnalyzeParameters(sctx)
 	autoAnalyzeRatio := exec.ParseAutoAnalyzeRatio(parameters[variable.TiDBAutoAnalyzeRatio])
-	// Determine the time window for auto-analysis and verify if the current time falls within this range.
-	start, end, err := exec.ParseAutoAnalysisWindow(
-		parameters[variable.TiDBAutoAnalyzeStartTime],
-		parameters[variable.TiDBAutoAnalyzeEndTime],
-	)
-	if err != nil {
-		statslogutil.StatsLogger().Error(
-			"parse auto analyze period failed",
-			zap.Error(err),
-		)
-		return false
-	}
-	if !timeutil.WithinDayTimePeriod(start, end, time.Now()) {
+	start, end, ok := checkAutoAnalyzeWindow(parameters)
+	if !ok {
 		return false
 	}
+
 	pruneMode := variable.PartitionPruneMode(sctx.GetSessionVars().PartitionPruneMode.Load())
 
 	return RandomPickOneTableAndTryAutoAnalyze(
@@ -315,6 +305,32 @@ func HandleAutoAnalyze(
 	)
 }
 
+// CheckAutoAnalyzeWindow determine the time window for auto-analysis and verify if the current time falls within this range.
+// parameters is a map of auto analyze parameters. it is from GetAutoAnalyzeParameters.
+func CheckAutoAnalyzeWindow(sctx sessionctx.Context) bool {
+	parameters := exec.GetAutoAnalyzeParameters(sctx)
+	_, _, ok := checkAutoAnalyzeWindow(parameters)
+	return ok
+}
+
+func checkAutoAnalyzeWindow(parameters map[string]string) (time.Time, time.Time, bool) {
+	start, end, err := exec.ParseAutoAnalysisWindow(
+		parameters[variable.TiDBAutoAnalyzeStartTime],
+		parameters[variable.TiDBAutoAnalyzeEndTime],
+	)
+	if err != nil {
+		statslogutil.StatsLogger().Error(
+			"parse auto analyze period failed",
+			zap.Error(err),
+		)
+		return start, end, false
+	}
+	if !timeutil.WithinDayTimePeriod(start, end, time.Now()) {
+		return start, end, false
+	}
+	return start, end, true
+}
+
 // RandomPickOneTableAndTryAutoAnalyze randomly picks one table and tries to analyze it.
 // 1. If the table is not analyzed, analyze it.
 // 2. If the table is analyzed, analyze it when "tbl.ModifyCount/tbl.Count > autoAnalyzeRatio".

pkg/statistics/handle/autoanalyze/exec/BUILD.bazel

@@ -33,6 +33,7 @@ go_test(
         "//pkg/parser/model",
         "//pkg/sessionctx",
         "//pkg/testkit",
+        "//pkg/util",
         "@com_github_stretchr_testify//require",
     ],
 )

pkg/statistics/handle/autoanalyze/exec/exec.go

@@ -55,7 +55,7 @@ func AutoAnalyze(
 	params ...any,
 ) {
 	startTime := time.Now()
-	_, _, err := execAnalyzeStmt(sctx, statsHandle, sysProcTracker, statsVer, sql, params...)
+	_, _, err := RunAnalyzeStmt(sctx, statsHandle, sysProcTracker, statsVer, sql, params...)
 	dur := time.Since(startTime)
 	metrics.AutoAnalyzeHistogram.Observe(dur.Seconds())
 	if err != nil {
@@ -75,7 +75,8 @@ func AutoAnalyze(
 	}
 }
 
-func execAnalyzeStmt(
+// RunAnalyzeStmt executes the analyze statement.
+func RunAnalyzeStmt(
 	sctx sessionctx.Context,
 	statsHandle statstypes.StatsHandle,
 	sysProcTracker sysproctrack.Tracker,

pkg/statistics/handle/autoanalyze/exec/exec_test.go

@@ -15,12 +15,15 @@
 package exec_test
 
 import (
+	"fmt"
 	"testing"
+	"time"
 
 	"github.com/pingcap/tidb/pkg/parser/model"
 	"github.com/pingcap/tidb/pkg/sessionctx"
 	"github.com/pingcap/tidb/pkg/statistics/handle/autoanalyze/exec"
 	"github.com/pingcap/tidb/pkg/testkit"
+	"github.com/pingcap/tidb/pkg/util"
 	"github.com/stretchr/testify/require"
 )
 
@@ -50,3 +53,35 @@ func TestExecAutoAnalyzes(t *testing.T) {
 	tblStats := handle.GetTableStats(tbl.Meta())
 	require.Equal(t, int64(3), tblStats.RealtimeCount)
 }
+
+func TestKillInWindows(t *testing.T) {
+	store, dom := testkit.CreateMockStoreAndDomain(t)
+	tk := testkit.NewTestKit(t, store)
+	tk.MustExec("use test")
+	tk.MustExec("create table t1 (a int, b int, index idx(a)) partition by range (a) (partition p0 values less than (2), partition p1 values less than (14))")
+	tk.MustExec("insert into t1 values (4, 4), (5, 5), (6, 6), (7, 7), (8, 8), (9, 9), (10, 10), (11, 11), (12, 12), (13, 13)")
+	handle := dom.StatsHandle()
+	sysProcTracker := dom.SysProcTracker()
+	now := time.Now()
+	startTime := now.Add(1 * time.Hour).Format("15:04 -0700")
+	endTime := now.Add(2 * time.Hour).Format("15:04 -0700")
+	tk.MustExec(fmt.Sprintf("SET GLOBAL tidb_auto_analyze_start_time='%s'", startTime))
+	tk.MustExec(fmt.Sprintf("SET GLOBAL tidb_auto_analyze_end_time='%s'", endTime))
+	var wg util.WaitGroupWrapper
+	exitCh := make(chan struct{})
+	wg.Run(func() {
+		for {
+			select {
+			case <-exitCh:
+				return
+			default:
+				dom.CheckAutoAnalyzeWindows()
+			}
+		}
+	})
+	sctx := tk.Session()
+	_, _, err := exec.RunAnalyzeStmt(sctx, handle, sysProcTracker, 2, "analyze table %n", "t1")
+	require.ErrorContains(t, err, "[executor:1317]Query execution was interrupted")
+	close(exitCh)
+	wg.Wait()
+}