Merge branch 'master' into fix-35856

Makefile

@@ -435,10 +435,10 @@ bazel_test: failpoint-enable bazel_ci_prepare
 
 
 bazel_coverage_test: failpoint-enable bazel_ci_prepare
-	bazel --output_user_root=/home/jenkins/.tidb/tmp coverage --config=ci --@io_bazel_rules_go//go/config:cover_format=go_cover \
+	bazel --output_user_root=/home/jenkins/.tidb/tmp coverage --config=ci --build_event_json_file=bazel_1.json --@io_bazel_rules_go//go/config:cover_format=go_cover \
 		-- //... -//cmd/... -//tests/graceshutdown/... \
 		-//tests/globalkilltest/... -//tests/readonlytest/... -//br/pkg/task:task_test
-	bazel --output_user_root=/home/jenkins/.tidb/tmp coverage --config=ci --@io_bazel_rules_go//go/config:cover_format=go_cover --define gotags=featuretag \
+	bazel --output_user_root=/home/jenkins/.tidb/tmp coverage --config=ci --build_event_json_file=bazel_2.json --@io_bazel_rules_go//go/config:cover_format=go_cover --define gotags=featuretag \
 		-- //... -//cmd/... -//tests/graceshutdown/... \
 		-//tests/globalkilltest/... -//tests/readonlytest/... -//br/pkg/task:task_test
 

SECURITY.md

@@ -26,7 +26,7 @@ The asterisk (*) indicates the required field.
 
 The TiDB security team will confirm the vulnerabilities and contact you within 2 working days after your submission.
 
-We will publicly thank you after fixing the security vulnerability. To avoid negative impact, please keep the vulnerability confidential until we fix it. We would appreciate it if you could obey the following code of conduct:
+We will publicly thank you once the security vulnerability has been fixed. To avoid negative impact, please keep the vulnerability confidential until we fix it. We would appreciate it if you could obey the following code of conduct:
 
 The vulnerability will not be disclosed until TiDB releases a patch for it.
 

bindinfo/BUILD.bazel

@@ -55,6 +55,7 @@ go_test(
         "temptable_test.go",
     ],
     embed = [":bindinfo"],
+    flaky = True,
     deps = [
         "//config",
         "//domain",

br/cmd/br/BUILD.bazel

@@ -56,4 +56,5 @@ go_test(
     name = "br_test",
     srcs = ["main_test.go"],
     embed = [":br_lib"],
+    flaky = True,
 )

br/cmd/tidb-lightning-ctl/BUILD.bazel

@@ -28,4 +28,5 @@ go_test(
     name = "tidb-lightning-ctl_test",
     srcs = ["main_test.go"],
     embed = [":tidb-lightning-ctl_lib"],
+    flaky = True,
 )

br/cmd/tidb-lightning/BUILD.bazel

@@ -25,4 +25,5 @@ go_test(
     name = "tidb-lightning_test",
     srcs = ["main_test.go"],
     embed = [":tidb-lightning_lib"],
+    flaky = True,
 )

br/pkg/backup/BUILD.bazel

@@ -64,6 +64,7 @@ go_test(
         "schema_test.go",
     ],
     embed = [":backup"],
+    flaky = True,
     deps = [
         "//br/pkg/conn",
         "//br/pkg/metautil",

br/pkg/checksum/BUILD.bazel

@@ -35,6 +35,7 @@ go_test(
         "main_test.go",
     ],
     embed = [":checksum"],
+    flaky = True,
     deps = [
         "//br/pkg/backup",
         "//br/pkg/metautil",

br/pkg/conn/BUILD.bazel

@@ -14,6 +14,7 @@ go_library(
         "//br/pkg/version",
         "//domain",
         "//kv",
+        "//util/engine",
         "@com_github_docker_go_units//:go-units",
         "@com_github_opentracing_opentracing_go//:opentracing-go",
         "@com_github_pingcap_errors//:errors",
@@ -41,6 +42,7 @@ go_test(
         "main_test.go",
     ],
     embed = [":conn"],
+    flaky = True,
     deps = [
         "//br/pkg/pdutil",
         "//br/pkg/utils",

br/pkg/conn/conn.go

@@ -27,6 +27,7 @@ import (
 	"github.com/pingcap/tidb/br/pkg/version"
 	"github.com/pingcap/tidb/domain"
 	"github.com/pingcap/tidb/kv"
+	"github.com/pingcap/tidb/util/engine"
 	"github.com/tikv/client-go/v2/oracle"
 	"github.com/tikv/client-go/v2/tikv"
 	"github.com/tikv/client-go/v2/txnkv/txnlock"
@@ -100,7 +101,7 @@ func GetAllTiKVStores(
 	j := 0
 	for _, store := range stores {
 		isTiFlash := false
-		if version.IsTiFlash(store) {
+		if engine.IsTiFlash(store) {
 			if storeBehavior == SkipTiFlash {
 				continue
 			} else if storeBehavior == ErrorOnTiFlash {

br/pkg/errors/BUILD.bazel

@@ -11,6 +11,7 @@ go_library(
 go_test(
     name = "errors_test",
     srcs = ["errors_test.go"],
+    flaky = True,
     deps = [
         ":errors",
         "@com_github_pingcap_errors//:errors",

br/pkg/glue/BUILD.bazel

@@ -25,6 +25,7 @@ go_library(
 go_test(
     name = "glue_test",
     srcs = ["console_glue_test.go"],
+    flaky = True,
     deps = [
         ":glue",
         "@com_github_fatih_color//:color",

br/pkg/gluetikv/BUILD.bazel

@@ -22,5 +22,6 @@ go_test(
     name = "gluetikv_test",
     srcs = ["glue_test.go"],
     embed = [":gluetikv"],
+    flaky = True,
     deps = ["@com_github_stretchr_testify//require"],
 )

br/pkg/lightning/BUILD.bazel

@@ -48,6 +48,7 @@ go_test(
         "main_test.go",
     ],
     embed = [":lightning"],
+    flaky = True,
     deps = [
         "//br/pkg/lightning/checkpoints",
         "//br/pkg/lightning/config",

br/pkg/lightning/backend/BUILD.bazel

@@ -26,6 +26,7 @@ go_library(
 go_test(
     name = "backend_test",
     srcs = ["backend_test.go"],
+    flaky = True,
     deps = [
         ":backend",
         "//br/pkg/lightning/backend/kv",

br/pkg/lightning/backend/kv/BUILD.bazel

@@ -50,6 +50,7 @@ go_test(
         "sql2kv_test.go",
     ],
     embed = [":kv"],
+    flaky = True,
     deps = [
         "//br/pkg/lightning/common",
         "//br/pkg/lightning/log",

br/pkg/lightning/backend/local/BUILD.bazel

@@ -43,6 +43,7 @@ go_library(
         "//table",
         "//tablecodec",
         "//util/codec",
+        "//util/engine",
         "//util/hack",
         "//util/mathutil",
         "//util/ranger",
@@ -88,6 +89,7 @@ go_test(
         "localhelper_test.go",
     ],
     embed = [":local"],
+    flaky = True,
     deps = [
         "//br/pkg/lightning/backend",
         "//br/pkg/lightning/backend/kv",
@@ -100,14 +102,14 @@ go_test(
         "//br/pkg/pdutil",
         "//br/pkg/restore",
         "//br/pkg/utils",
-        "//br/pkg/version",
         "//kv",
         "//parser/mysql",
         "//sessionctx/stmtctx",
         "//store/pdtypes",
         "//tablecodec",
         "//types",
         "//util/codec",
+        "//util/engine",
         "//util/hack",
         "@com_github_cockroachdb_pebble//:pebble",
         "@com_github_cockroachdb_pebble//sstable",

br/pkg/lightning/backend/local/local.go

@@ -58,6 +58,7 @@ import (
 	"github.com/pingcap/tidb/table"
 	"github.com/pingcap/tidb/tablecodec"
 	"github.com/pingcap/tidb/util/codec"
+	"github.com/pingcap/tidb/util/engine"
 	"github.com/pingcap/tidb/util/mathutil"
 	tikverror "github.com/tikv/client-go/v2/error"
 	"github.com/tikv/client-go/v2/oracle"
@@ -501,15 +502,15 @@ func (local *local) checkMultiIngestSupport(ctx context.Context) error {
 
 	hasTiFlash := false
 	for _, s := range stores {
-		if s.State == metapb.StoreState_Up && version.IsTiFlash(s) {
+		if s.State == metapb.StoreState_Up && engine.IsTiFlash(s) {
 			hasTiFlash = true
 			break
 		}
 	}
 
 	for _, s := range stores {
 		// skip stores that are not online
-		if s.State != metapb.StoreState_Up || version.IsTiFlash(s) {
+		if s.State != metapb.StoreState_Up || engine.IsTiFlash(s) {
 			continue
 		}
 		var err error
@@ -1994,7 +1995,7 @@ func getRegionSplitSizeKeys(ctx context.Context, cli pd.Client, tls *common.TLS)
 		return 0, 0, err
 	}
 	for _, store := range stores {
-		if store.StatusAddress == "" || version.IsTiFlash(store) {
+		if store.StatusAddress == "" || engine.IsTiFlash(store) {
 			continue
 		}
 		serverInfo := infoschema.ServerInfo{

br/pkg/lightning/backend/local/local_test.go

@@ -48,12 +48,12 @@ import (
 	"github.com/pingcap/tidb/br/pkg/pdutil"
 	"github.com/pingcap/tidb/br/pkg/restore"
 	"github.com/pingcap/tidb/br/pkg/utils"
-	"github.com/pingcap/tidb/br/pkg/version"
 	tidbkv "github.com/pingcap/tidb/kv"
 	"github.com/pingcap/tidb/sessionctx/stmtctx"
 	"github.com/pingcap/tidb/tablecodec"
 	"github.com/pingcap/tidb/types"
 	"github.com/pingcap/tidb/util/codec"
+	"github.com/pingcap/tidb/util/engine"
 	"github.com/pingcap/tidb/util/hack"
 	"github.com/stretchr/testify/require"
 	pd "github.com/tikv/pd/client"
@@ -1022,7 +1022,7 @@ func TestMultiIngest(t *testing.T) {
 				return store.State == metapb.StoreState_Up
 			},
 			func(s *metapb.Store) bool {
-				return !version.IsTiFlash(s)
+				return !engine.IsTiFlash(s)
 			},
 			0,
 			nil,
@@ -1035,7 +1035,7 @@ func TestMultiIngest(t *testing.T) {
 				return store.State == metapb.StoreState_Up
 			},
 			func(s *metapb.Store) bool {
-				return version.IsTiFlash(s)
+				return engine.IsTiFlash(s)
 			},
 			0,
 			nil,
@@ -1071,10 +1071,10 @@ func TestMultiIngest(t *testing.T) {
 		// test all non-tiflash stores that support multi ingests
 		{
 			func(store *metapb.Store) bool {
-				return !version.IsTiFlash(store)
+				return !engine.IsTiFlash(store)
 			},
 			func(s *metapb.Store) bool {
-				return !version.IsTiFlash(s)
+				return !engine.IsTiFlash(s)
 			},
 			0,
 			nil,
@@ -1110,7 +1110,7 @@ func TestMultiIngest(t *testing.T) {
 		// test grpc return error but no tiflash
 		{
 			func(store *metapb.Store) bool {
-				return !version.IsTiFlash(store)
+				return !engine.IsTiFlash(store)
 			},
 			func(s *metapb.Store) bool {
 				return true
@@ -1123,7 +1123,7 @@ func TestMultiIngest(t *testing.T) {
 		// test grpc return error and contains offline tiflash
 		{
 			func(store *metapb.Store) bool {
-				return !version.IsTiFlash(store) || store.State != metapb.StoreState_Up
+				return !engine.IsTiFlash(store) || store.State != metapb.StoreState_Up
 			},
 			func(s *metapb.Store) bool {
 				return true

br/pkg/lightning/backend/tidb/BUILD.bazel

@@ -32,6 +32,7 @@ go_library(
 go_test(
     name = "tidb_test",
     srcs = ["tidb_test.go"],
+    flaky = True,
     deps = [
         ":tidb",
         "//br/pkg/lightning/backend",

br/pkg/lightning/checkpoints/BUILD.bazel

@@ -40,6 +40,7 @@ go_test(
         "main_test.go",
     ],
     embed = [":checkpoints"],
+    flaky = True,
     deps = [
         "//br/pkg/lightning/checkpoints/checkpointspb",
         "//br/pkg/lightning/config",

br/pkg/lightning/common/BUILD.bazel

@@ -50,6 +50,7 @@ go_test(
         "util_test.go",
     ],
     embed = [":common"],
+    flaky = True,
     deps = [
         "//br/pkg/errors",
         "//br/pkg/lightning/log",

br/pkg/lightning/config/BUILD.bazel

@@ -36,6 +36,7 @@ go_test(
         "config_test.go",
         "configlist_test.go",
     ],
+    flaky = True,
     deps = [
         ":config",
         "//parser/mysql",

br/pkg/lightning/errormanager/BUILD.bazel

@@ -24,6 +24,7 @@ go_test(
     name = "errormanager_test",
     srcs = ["errormanager_test.go"],
     embed = [":errormanager"],
+    flaky = True,
     deps = [
         "//br/pkg/lightning/config",
         "//br/pkg/lightning/log",

br/pkg/lightning/log/BUILD.bazel

@@ -27,6 +27,7 @@ go_test(
         "filter_test.go",
         "log_test.go",
     ],
+    flaky = True,
     importpath = "github.com/pingcap/tidb/br/pkg/lightning/log_test",
     deps = [
         ":log",

br/pkg/lightning/metric/BUILD.bazel

@@ -15,6 +15,7 @@ go_library(
 go_test(
     name = "metric_test",
     srcs = ["metric_test.go"],
+    flaky = True,
     deps = [
         ":metric",
         "//util/promutil",

br/pkg/lightning/mydump/BUILD.bazel

@@ -59,6 +59,7 @@ go_test(
         "examples/*",
     ]),
     embed = [":mydump"],
+    flaky = True,
     deps = [
         "//br/pkg/lightning/config",
         "//br/pkg/lightning/log",

br/pkg/lightning/restore/BUILD.bazel

@@ -54,6 +54,7 @@ go_library(
         "//table/tables",
         "//types",
         "//util/collate",
+        "//util/engine",
         "//util/mathutil",
         "//util/mock",
         "@com_github_coreos_go_semver//semver",
@@ -91,6 +92,7 @@ go_test(
         "tidb_test.go",
     ],
     embed = [":restore"],
+    flaky = True,
     deps = [
         "//br/pkg/lightning/backend",
         "//br/pkg/lightning/backend/kv",

br/pkg/lightning/restore/check_info.go

@@ -38,6 +38,7 @@ import (
 	"github.com/pingcap/tidb/store/pdtypes"
 	"github.com/pingcap/tidb/table"
 	"github.com/pingcap/tidb/types"
+	"github.com/pingcap/tidb/util/engine"
 	"github.com/pingcap/tidb/util/mathutil"
 	"go.uber.org/zap"
 	"golang.org/x/exp/slices"
@@ -169,15 +170,6 @@ func (rc *Controller) ClusterIsAvailable(ctx context.Context) {
 	}
 }
 
-func isTiFlash(store *pdtypes.MetaStore) bool {
-	for _, label := range store.Labels {
-		if label.Key == "engine" && label.Value == "tiflash" {
-			return true
-		}
-	}
-	return false
-}
-
 func (rc *Controller) checkEmptyRegion(ctx context.Context) error {
 	passed := true
 	message := "Cluster doesn't have too many empty regions"
@@ -228,7 +220,7 @@ func (rc *Controller) checkEmptyRegion(ctx context.Context) error {
 			if metapb.StoreState(metapb.StoreState_value[store.Store.StateName]) != metapb.StoreState_Up {
 				continue
 			}
-			if isTiFlash(store.Store) {
+			if engine.IsTiFlash(store.Store.Store) {
 				continue
 			}
 			if regionCnt > errorThrehold {
@@ -272,7 +264,7 @@ func (rc *Controller) checkRegionDistribution(ctx context.Context) error {
 		if metapb.StoreState(metapb.StoreState_value[store.Store.StateName]) != metapb.StoreState_Up {
 			continue
 		}
-		if isTiFlash(store.Store) {
+		if engine.IsTiFlash(store.Store.Store) {
 			continue
 		}
 		stores = append(stores, store)