This is an automated cherry-pick of pingcap#57712

Signed-off-by: ti-chi-bot <[email protected]>

Author: hawkingrei

pkg/statistics/handle/handle_hist.go

@@ -41,7 +41,7 @@ import (
 )
 
 // RetryCount is the max retry count for a sync load task.
-const RetryCount = 3
+const RetryCount = 2
 
 var globalStatsSyncLoadSingleFlight singleflight.Group
 
@@ -97,10 +97,22 @@ func (h *Handle) SendLoadRequests(sc *stmtctx.StatementContext, neededHistItems
 				ResultCh:    make(chan stmtctx.StatsLoadResult, 1),
 			}
 			select {
+<<<<<<< HEAD:pkg/statistics/handle/handle_hist.go
 			case h.StatsLoad.NeededItemsCh <- task:
 				result, ok := <-task.ResultCh
 				intest.Assert(ok, "task.ResultCh cannot be closed")
 				return result, nil
+=======
+			case s.StatsLoad.NeededItemsCh <- task:
+				metrics.SyncLoadDedupCounter.Inc()
+				select {
+				case <-timer.C:
+					return nil, errors.New("sync load took too long to return")
+				case result, ok := <-task.ResultCh:
+					intest.Assert(ok, "task.ResultCh cannot be closed")
+					return result, nil
+				}
+>>>>>>> d0de86be941 (statistics: rightly deal with timout when to send sync load (#57712)):pkg/statistics/handle/syncload/stats_syncload.go
 			case <-timer.C:
 				return nil, errors.New("sync load stats channel is full and timeout sending task to channel")
 			}

pkg/statistics/handle/handle_hist_test.go

@@ -343,3 +343,47 @@ func TestRetry(t *testing.T) {
 	}
 	require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/statistics/handle/mockReadStatsForOneFail"))
 }
+
+func TestSendLoadRequestsWaitTooLong(t *testing.T) {
+	originConfig := config.GetGlobalConfig()
+	newConfig := config.NewConfig()
+	newConfig.Performance.StatsLoadConcurrency = -1 // no worker to consume channel
+	newConfig.Performance.StatsLoadQueueSize = 10000
+	config.StoreGlobalConfig(newConfig)
+	defer config.StoreGlobalConfig(originConfig)
+	store, dom := testkit.CreateMockStoreAndDomain(t)
+
+	tk := testkit.NewTestKit(t, store)
+	tk.MustExec("use test")
+	tk.MustExec("create table t(a int, b int, c int, primary key(a), key idx(b,c))")
+	tk.MustExec("insert into t values (1,1,1),(2,2,2),(3,3,3)")
+
+	oriLease := dom.StatsHandle().Lease()
+	dom.StatsHandle().SetLease(1)
+	defer func() {
+		dom.StatsHandle().SetLease(oriLease)
+	}()
+	tk.MustExec("analyze table t all columns")
+	h := dom.StatsHandle()
+	is := dom.InfoSchema()
+	tbl, err := is.TableByName(context.Background(), pmodel.NewCIStr("test"), pmodel.NewCIStr("t"))
+	require.NoError(t, err)
+	tableInfo := tbl.Meta()
+	neededColumns := make([]model.StatsLoadItem, 0, len(tableInfo.Columns))
+	for _, col := range tableInfo.Columns {
+		neededColumns = append(neededColumns, model.StatsLoadItem{TableItemID: model.TableItemID{TableID: tableInfo.ID, ID: col.ID, IsIndex: false}, FullLoad: true})
+	}
+	stmtCtx := stmtctx.NewStmtCtx()
+	timeout := time.Nanosecond * 100
+	require.NoError(t, h.SendLoadRequests(stmtCtx, neededColumns, timeout))
+	for _, resultCh := range stmtCtx.StatsLoad.ResultCh {
+		rs1 := <-resultCh
+		require.Error(t, rs1.Err)
+	}
+	stmtCtx1 := stmtctx.NewStmtCtx()
+	require.NoError(t, h.SendLoadRequests(stmtCtx1, neededColumns, timeout))
+	for _, resultCh := range stmtCtx1.StatsLoad.ResultCh {
+		rs1 := <-resultCh
+		require.Error(t, rs1.Err)
+	}
+}

pkg/statistics/handle/syncload/BUILD.bazel

@@ -0,0 +1,54 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
+
+go_library(
+    name = "syncload",
+    srcs = ["stats_syncload.go"],
+    importpath = "github.com/pingcap/tidb/pkg/statistics/handle/syncload",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//pkg/config",
+        "//pkg/infoschema",
+        "//pkg/kv",
+        "//pkg/meta/model",
+        "//pkg/metrics",
+        "//pkg/parser/mysql",
+        "//pkg/sessionctx",
+        "//pkg/sessionctx/stmtctx",
+        "//pkg/sessionctx/variable",
+        "//pkg/statistics",
+        "//pkg/statistics/handle/storage",
+        "//pkg/statistics/handle/types",
+        "//pkg/table",
+        "//pkg/types",
+        "//pkg/util",
+        "//pkg/util/intest",
+        "//pkg/util/logutil",
+        "@com_github_pingcap_errors//:errors",
+        "@com_github_pingcap_failpoint//:failpoint",
+        "@org_golang_x_sync//singleflight",
+        "@org_uber_go_zap//:zap",
+    ],
+)
+
+go_test(
+    name = "syncload_test",
+    timeout = "short",
+    srcs = ["stats_syncload_test.go"],
+    flaky = True,
+    race = "on",
+    shard_count = 7,
+    deps = [
+        ":syncload",
+        "//pkg/config",
+        "//pkg/meta/model",
+        "//pkg/parser/model",
+        "//pkg/sessionctx",
+        "//pkg/sessionctx/stmtctx",
+        "//pkg/statistics/handle/types",
+        "//pkg/testkit",
+        "//pkg/testkit/analyzehelper",
+        "//pkg/util/mathutil",
+        "@com_github_pingcap_failpoint//:failpoint",
+        "@com_github_stretchr_testify//require",
+    ],
+)