statistics, config: rightly deal with innodb_lock_wait_timeout when to load stats (#65632) (#65759)

close #65634

Author: ti-chi-bot

pkg/executor/BUILD.bazel

@@ -212,6 +212,7 @@ go_library(
         "//pkg/util/chunk",
         "//pkg/util/codec",
         "//pkg/util/collate",
+        "//pkg/util/config",
         "//pkg/util/context",
         "//pkg/util/cteutil",
         "//pkg/util/dbterror",
@@ -261,7 +262,6 @@ go_library(
         "//pkg/util/topsql",
         "//pkg/util/topsql/state",
         "//pkg/util/tracing",
-        "@com_github_burntsushi_toml//:toml",
         "@com_github_docker_go_units//:go-units",
         "@com_github_gogo_protobuf//proto",
         "@com_github_google_uuid//:uuid",

pkg/executor/plan_replayer.go

@@ -23,7 +23,6 @@ import (
 	"os"
 	"strings"
 
-	"github.com/BurntSushi/toml"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/tidb/pkg/domain"
 	"github.com/pingcap/tidb/pkg/executor/internal/exec"
@@ -35,6 +34,7 @@ import (
 	"github.com/pingcap/tidb/pkg/sessiontxn"
 	"github.com/pingcap/tidb/pkg/statistics/handle/util"
 	"github.com/pingcap/tidb/pkg/util/chunk"
+	"github.com/pingcap/tidb/pkg/util/config"
 	"github.com/pingcap/tidb/pkg/util/logutil"
 	"github.com/pingcap/tidb/pkg/util/replayer"
 	"go.uber.org/zap"
@@ -365,41 +365,19 @@ func loadBindings(ctx sessionctx.Context, f *zip.File, isSession bool) error {
 }
 
 func loadVariables(ctx sessionctx.Context, z *zip.Reader) error {
-	unLoadVars := make([]string, 0)
+	var unLoadVars []string
 	for _, zipFile := range z.File {
 		if strings.Compare(zipFile.Name, domain.PlanReplayerVariablesFile) == 0 {
-			varMap := make(map[string]string)
 			v, err := zipFile.Open()
 			if err != nil {
 				return errors.AddStack(err)
 			}
 			//nolint: errcheck,all_revive,revive
 			defer v.Close()
-			_, err = toml.NewDecoder(v).Decode(&varMap)
+			unLoadVars, err = config.LoadConfigForPlanReplayerLoad(ctx, v)
 			if err != nil {
 				return errors.AddStack(err)
 			}
-			vars := ctx.GetSessionVars()
-			for name, value := range varMap {
-				sysVar := variable.GetSysVar(name)
-				if sysVar == nil {
-					unLoadVars = append(unLoadVars, name)
-					logutil.BgLogger().Warn(fmt.Sprintf("skip set variable %s:%s", name, value), zap.Error(err))
-					continue
-				}
-				sVal, err := sysVar.Validate(vars, value, variable.ScopeSession)
-				if err != nil {
-					unLoadVars = append(unLoadVars, name)
-					logutil.BgLogger().Warn(fmt.Sprintf("skip variable %s:%s", name, value), zap.Error(err))
-					continue
-				}
-				err = vars.SetSystemVar(name, sVal)
-				if err != nil {
-					unLoadVars = append(unLoadVars, name)
-					logutil.BgLogger().Warn(fmt.Sprintf("skip set variable %s:%s", name, value), zap.Error(err))
-					continue
-				}
-			}
 		}
 	}
 	if len(unLoadVars) > 0 {
@@ -463,7 +441,7 @@ func loadStats(ctx sessionctx.Context, f *zip.File) error {
 	do := domain.GetDomain(ctx)
 	h := do.StatsHandle()
 	if h == nil {
-		return errors.New("plan replayer: hanlde is nil")
+		return errors.New("plan replayer: handle is nil")
 	}
 	return h.LoadStatsFromJSON(context.Background(), ctx.GetInfoSchema().(infoschema.InfoSchema), jsonTbl, 0)
 }

pkg/statistics/handle/util/util.go

@@ -199,6 +199,17 @@ func UpdateSCtxVarsForStats(sctx sessionctx.Context) error {
 		return err
 	}
 	sctx.GetSessionVars().StmtCtx.SetTimeZone(sctx.GetSessionVars().Location())
+
+	// sync innodb_lock_wait_timeout
+	val, err = sctx.GetSessionVars().GlobalVarsAccessor.GetGlobalSysVar(variable.InnodbLockWaitTimeout)
+	if err != nil {
+		return err
+	}
+	lockWaitSec, err := strconv.ParseInt(val, 10, 64)
+	if err != nil {
+		return err
+	}
+	sctx.GetSessionVars().LockWaitTimeout = lockWaitSec * 1000
 	return nil
 }
 

pkg/util/config/BUILD.bazel

@@ -0,0 +1,16 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "config",
+    srcs = ["config.go"],
+    importpath = "github.com/pingcap/tidb/pkg/util/config",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//pkg/sessionctx",
+        "//pkg/sessionctx/variable",
+        "//pkg/util/logutil",
+        "@com_github_burntsushi_toml//:toml",
+        "@com_github_pingcap_errors//:errors",
+        "@org_uber_go_zap//:zap",
+    ],
+)

pkg/util/config/config.go

@@ -0,0 +1,68 @@
+// Copyright 2025 PingCAP, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package config
+
+import (
+	"fmt"
+	"io"
+
+	"github.com/BurntSushi/toml"
+	"github.com/pingcap/errors"
+	"github.com/pingcap/tidb/pkg/sessionctx"
+	"github.com/pingcap/tidb/pkg/sessionctx/variable"
+	"github.com/pingcap/tidb/pkg/util/logutil"
+	"go.uber.org/zap"
+)
+
+var ignoredSystemVariablesForPlanReplayerLoad = map[string]struct{}{
+	variable.InnodbLockWaitTimeout: {}, // It is unnecessary to load this variable for plan replayer.
+}
+
+// LoadConfigForPlanReplayerLoad loads system variables from a toml reader. it is only for plan replayer and test.
+func LoadConfigForPlanReplayerLoad(ctx sessionctx.Context, v io.ReadCloser) (unLoadVars []string, err error) {
+	varMap := make(map[string]string)
+
+	_, err = toml.NewDecoder(v).Decode(&varMap)
+	if err != nil {
+		return nil, errors.AddStack(err)
+	}
+	unLoadVars = make([]string, 0)
+	vars := ctx.GetSessionVars()
+	for name, value := range varMap {
+		if _, ok := ignoredSystemVariablesForPlanReplayerLoad[name]; ok {
+			logutil.BgLogger().Warn(fmt.Sprintf("ignore set variable %s:%s", name, value), zap.Error(err))
+			continue
+		}
+		sysVar := variable.GetSysVar(name)
+		if sysVar == nil {
+			unLoadVars = append(unLoadVars, name)
+			logutil.BgLogger().Warn(fmt.Sprintf("skip set variable %s:%s", name, value), zap.Error(err))
+			continue
+		}
+		sVal, err := sysVar.Validate(vars, value, variable.ScopeSession)
+		if err != nil {
+			unLoadVars = append(unLoadVars, name)
+			logutil.BgLogger().Warn(fmt.Sprintf("skip variable %s:%s", name, value), zap.Error(err))
+			continue
+		}
+		err = vars.SetSystemVar(name, sVal)
+		if err != nil {
+			unLoadVars = append(unLoadVars, name)
+			logutil.BgLogger().Warn(fmt.Sprintf("skip set variable %s:%s", name, value), zap.Error(err))
+			continue
+		}
+	}
+	return unLoadVars, nil
+}