Release 8.5 20260225 v8.5.2 | pd=@pull-10500-9f9829d_linux_amd64

DEPS.bzl

@@ -5737,13 +5737,14 @@ def go_deps():
         name = "com_github_pingcap_errors",
         build_file_proto_mode = "disable_global",
         importpath = "github.com/pingcap/errors",
-        sha256 = "1bb6a8df52d6fa2fdfda718c21fe8f9628d1c85d9c9ef91fa054b8663ae10048",
-        strip_prefix = "github.com/pingcap/errors@v0.11.5-0.20241219054535-6b8c588c3122",
+        sha256 = "b696ac3d19b74bd6c3454048767bf145c7d8b4d24c55337b27d2e0960d948949",
+        strip_prefix = "github.com/pingcap/errors@v0.11.5-0.20250523034308-74f78ae071ee",
         urls = [
-            "http://bazel-cache.pingcap.net:8080/gomod/github.com/pingcap/errors/com_github_pingcap_errors-v0.11.5-0.20241219054535-6b8c588c3122.zip",
-            "http://ats.apps.svc/gomod/github.com/pingcap/errors/com_github_pingcap_errors-v0.11.5-0.20241219054535-6b8c588c3122.zip",
-            "https://cache.hawkingrei.com/gomod/github.com/pingcap/errors/com_github_pingcap_errors-v0.11.5-0.20241219054535-6b8c588c3122.zip",
-            "https://storage.googleapis.com/pingcapmirror/gomod/github.com/pingcap/errors/com_github_pingcap_errors-v0.11.5-0.20241219054535-6b8c588c3122.zip",
+            "http://bazel-cache.pingcap.net:8080/gomod/github.com/pingcap/errors/com_github_pingcap_errors-v0.11.5-0.20250523034308-74f78ae071ee.zip",
+            "http://ats.apps.svc/gomod/github.com/pingcap/errors/com_github_pingcap_errors-v0.11.5-0.20250523034308-74f78ae071ee.zip",
+            "https://cache.hawkingrei.com/gomod/github.com/pingcap/errors/com_github_pingcap_errors-v0.11.5-0.20250523034308-74f78ae071ee.zip",
+            "https://storage.googleapis.com/pingcapmirror/gomod/github.com/pingcap/errors/com_github_pingcap_errors-v0.11.5-0.20250523034308-74f78ae071ee.zip",
+            "https://proxy.golang.org/github.com/pingcap/errors/@v/v0.11.5-0.20250523034308-74f78ae071ee.zip",
         ],
     )
     go_repository(
@@ -5789,13 +5790,14 @@ def go_deps():
         name = "com_github_pingcap_kvproto",
         build_file_proto_mode = "disable_global",
         importpath = "github.com/pingcap/kvproto",
-        sha256 = "6f2a7d747d05ae61a8f4a3c066058fa69f724480f8dc4a427d66fd066ce730c7",
-        strip_prefix = "github.com/pingcap/kvproto@v0.0.0-20240924080114-4a3e17f5e62d",
+        sha256 = "b3d04d57086652d41ad930c3359aa2f1a65cd6d8c47d7a3e360e72b7dbb1839f",
+        strip_prefix = "github.com/pingcap/kvproto@v0.0.0-20241216091609-64f8b30fe341",
         urls = [
-            "http://bazel-cache.pingcap.net:8080/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20240924080114-4a3e17f5e62d.zip",
-            "http://ats.apps.svc/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20240924080114-4a3e17f5e62d.zip",
-            "https://cache.hawkingrei.com/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20240924080114-4a3e17f5e62d.zip",
-            "https://storage.googleapis.com/pingcapmirror/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20240924080114-4a3e17f5e62d.zip",
+            "http://bazel-cache.pingcap.net:8080/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20241216091609-64f8b30fe341.zip",
+            "http://ats.apps.svc/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20241216091609-64f8b30fe341.zip",
+            "https://cache.hawkingrei.com/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20241216091609-64f8b30fe341.zip",
+            "https://storage.googleapis.com/pingcapmirror/gomod/github.com/pingcap/kvproto/com_github_pingcap_kvproto-v0.0.0-20241216091609-64f8b30fe341.zip",
+            "https://proxy.golang.org/github.com/pingcap/kvproto/@v/v0.0.0-20241216091609-64f8b30fe341.zip",
         ],
     )
     go_repository(
@@ -6933,26 +6935,20 @@ def go_deps():
         name = "com_github_tikv_client_go_v2",
         build_file_proto_mode = "disable_global",
         importpath = "github.com/tikv/client-go/v2",
-        sha256 = "c90c65a42afdadc516039343423efc126dde19faa143b86d20fee3f902715dea",
-        strip_prefix = "github.com/tikv/client-go/v2@v2.0.8-0.20250417032542-dfc632806f5f",
+        sha256 = "33407cf9792439b96ae2062a6b20233ea32c2e0907dc6baaa926cff09d68b309",
+        strip_prefix = "github.com/ClamChowderTiDB/client-go/v2@v2.0.8-0.20260327194506-26bf6c5f752d",
         urls = [
-            "http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20250417032542-dfc632806f5f.zip",
-            "http://ats.apps.svc/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20250417032542-dfc632806f5f.zip",
-            "https://cache.hawkingrei.com/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20250417032542-dfc632806f5f.zip",
-            "https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/client-go/v2/com_github_tikv_client_go_v2-v2.0.8-0.20250417032542-dfc632806f5f.zip",
+            "https://proxy.golang.org/github.com/!clam!chowder!ti!d!b/client-go/v2/@v/v2.0.8-0.20260327194506-26bf6c5f752d.zip",
         ],
     )
     go_repository(
         name = "com_github_tikv_pd_client",
         build_file_proto_mode = "disable_global",
         importpath = "github.com/tikv/pd/client",
-        sha256 = "8563346bf9562e5e92bde3795d68feb76d68c7967c75394b1706cfb4667c8605",
-        strip_prefix = "github.com/tikv/pd/client@v0.0.0-20250213080903-727c2086a763",
+        sha256 = "122e540d5c39eb0539948c641163abb6ac5c06462f5c1dc3b6ede570a0af62d3",
+        strip_prefix = "github.com/ClamChowderTiDB/pd/client@v0.0.0-20260325174811-bb159202fc25",
         urls = [
-            "http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20250213080903-727c2086a763.zip",
-            "http://ats.apps.svc/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20250213080903-727c2086a763.zip",
-            "https://cache.hawkingrei.com/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20250213080903-727c2086a763.zip",
-            "https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20250213080903-727c2086a763.zip",
+            "https://proxy.golang.org/github.com/!clam!chowder!ti!d!b/pd/client/@v/v0.0.0-20260325174811-bb159202fc25.zip",
         ],
     )
     go_repository(

Makefile

@@ -446,7 +446,7 @@ br_unit_test: export ARGS=$$($(BR_PACKAGES))
 br_unit_test:
 	@make failpoint-enable
 	@export TZ='Asia/Shanghai';
-	$(GOTEST) $(RACE_FLAG) -ldflags '$(LDFLAGS)' $(ARGS) -coverprofile=coverage.txt || ( make failpoint-disable && exit 1 )
+	$(GOTEST) --tags=deadlock,intest $(RACE_FLAG) -ldflags '$(LDFLAGS)' $(ARGS) -coverprofile=coverage.txt || ( make failpoint-disable && exit 1 )
 	@make failpoint-disable
 
 .PHONY: br_unit_test_in_verify_ci
@@ -455,7 +455,7 @@ br_unit_test_in_verify_ci: tools/bin/gotestsum
 	@make failpoint-enable
 	@export TZ='Asia/Shanghai';
 	@mkdir -p $(TEST_COVERAGE_DIR)
-	CGO_ENABLED=1 tools/bin/gotestsum --junitfile "$(TEST_COVERAGE_DIR)/br-junit-report.xml" -- $(RACE_FLAG) -ldflags '$(LDFLAGS)' \
+	CGO_ENABLED=1 tools/bin/gotestsum --junitfile "$(TEST_COVERAGE_DIR)/br-junit-report.xml" -- --tags=deadlock,intest $(RACE_FLAG) -ldflags '$(LDFLAGS)' \
 	$(ARGS) -coverprofile="$(TEST_COVERAGE_DIR)/br_cov.unit_test.out" || ( make failpoint-disable && exit 1 )
 	@make failpoint-disable
 
@@ -624,21 +624,21 @@ bazel_test: failpoint-enable bazel_prepare
 	bazel $(BAZEL_GLOBAL_CONFIG) test $(BAZEL_CMD_CONFIG) --build_tests_only --test_keep_going=false \
 		--define gotags=deadlock,intest \
 		-- //... -//cmd/... -//tests/graceshutdown/... \
-		-//tests/globalkilltest/... -//tests/readonlytest/... -//br/pkg/task:task_test -//tests/realtikvtest/...
+		-//tests/globalkilltest/... -//tests/readonlytest/... -//tests/realtikvtest/...
 
 .PHONY: bazel_coverage_test
 bazel_coverage_test: failpoint-enable bazel_ci_simple_prepare
 	bazel $(BAZEL_GLOBAL_CONFIG) --nohome_rc coverage $(BAZEL_CMD_CONFIG) $(BAZEL_INSTRUMENTATION_FILTER) --jobs=35 --build_tests_only --test_keep_going=false \
 		--@io_bazel_rules_go//go/config:cover_format=go_cover --define gotags=deadlock,intest \
 		-- //... -//cmd/... -//tests/graceshutdown/... \
-		-//tests/globalkilltest/... -//tests/readonlytest/... -//br/pkg/task:task_test -//tests/realtikvtest/...
+		-//tests/globalkilltest/... -//tests/readonlytest/... -//tests/realtikvtest/...
 
 .PHONY: bazel_coverage_test_ddlargsv1
 bazel_coverage_test_ddlargsv1: failpoint-enable bazel_ci_simple_prepare
 	bazel $(BAZEL_GLOBAL_CONFIG) --nohome_rc coverage $(BAZEL_CMD_CONFIG) $(BAZEL_INSTRUMENTATION_FILTER) --jobs=35 --build_tests_only --test_keep_going=false \
 		--@io_bazel_rules_go//go/config:cover_format=go_cover --define gotags=deadlock,intest,ddlargsv1 \
 		-- //... -//cmd/... -//tests/graceshutdown/... \
-		-//tests/globalkilltest/... -//tests/readonlytest/... -//br/pkg/task:task_test -//tests/realtikvtest/...
+		-//tests/globalkilltest/... -//tests/readonlytest/... -//tests/realtikvtest/...
 
 .PHONY: bazel_build
 bazel_build:

Makefile.common

@@ -67,10 +67,15 @@ UNCONVERT_PACKAGES := $$($(UNCONVERT_PACKAGES_LIST))
 FAILPOINT_ENABLE  := find $$PWD/ -type d | grep -vE "(\.git|tools)" | xargs tools/bin/failpoint-ctl enable
 FAILPOINT_DISABLE := find $$PWD/ -type d | grep -vE "(\.git|tools)" | xargs tools/bin/failpoint-ctl disable
 
-LDFLAGS += -X "github.com/pingcap/tidb/pkg/parser/mysql.TiDBReleaseVersion=$(shell git describe --tags --dirty --always)"
-LDFLAGS += -X "github.com/pingcap/tidb/pkg/util/versioninfo.TiDBBuildTS=$(shell date -u '+%Y-%m-%d %H:%M:%S')"
-LDFLAGS += -X "github.com/pingcap/tidb/pkg/util/versioninfo.TiDBGitHash=$(shell git rev-parse HEAD)"
-LDFLAGS += -X "github.com/pingcap/tidb/pkg/util/versioninfo.TiDBGitBranch=$(shell git rev-parse --abbrev-ref HEAD)"
+RELEASE_VERSION := $(shell git describe --tags --dirty --always)
+BUILDTS := $(shell date -u '+%Y-%m-%d %H:%M:%S')
+GITHASH := $(shell git rev-parse HEAD)
+GITBRANCH := $(shell git rev-parse --abbrev-ref HEAD)
+
+LDFLAGS += -X "github.com/pingcap/tidb/pkg/parser/mysql.TiDBReleaseVersion=$(RELEASE_VERSION)"
+LDFLAGS += -X "github.com/pingcap/tidb/pkg/util/versioninfo.TiDBBuildTS=$(BUILDTS)"
+LDFLAGS += -X "github.com/pingcap/tidb/pkg/util/versioninfo.TiDBGitHash=$(GITHASH)"
+LDFLAGS += -X "github.com/pingcap/tidb/pkg/util/versioninfo.TiDBGitBranch=$(GITBRANCH)"
 LDFLAGS += -X "github.com/pingcap/tidb/pkg/util/versioninfo.TiDBEdition=$(TIDB_EDITION)"
 
 EXTENSION_FLAG =

br/cmd/br/backup.go

@@ -26,7 +26,6 @@ func runBackupCommand(command *cobra.Command, cmdName string) error {
 		command.SilenceUsage = false
 		return errors.Trace(err)
 	}
-	overrideDefaultBackupConfigIfNeeded(&cfg, command)
 
 	if err := metricsutil.RegisterMetricsForBR(cfg.PD, cfg.KeyspaceName); err != nil {
 		return errors.Trace(err)
@@ -212,10 +211,3 @@ func newTxnBackupCommand() *cobra.Command {
 	task.DefineTxnBackupFlags(command)
 	return command
 }
-
-func overrideDefaultBackupConfigIfNeeded(config *task.BackupConfig, cmd *cobra.Command) {
-	// override only if flag not set by user
-	if !cmd.Flags().Changed(task.FlagChecksum) {
-		config.Checksum = false
-	}
-}

br/cmd/br/cmd.go

@@ -79,6 +79,17 @@ const (
 
 	flagVersion      = "version"
 	flagVersionShort = "V"
+
+	// Memory management related constants
+	quarterGiB uint64 = 256 * size.MB
+	halfGiB    uint64 = 512 * size.MB
+	fourGiB    uint64 = 4 * size.GB
+
+	// Environment variables
+	envBRHeapDumpDir = "BR_HEAP_DUMP_DIR"
+
+	// Default heap dump paths
+	defaultHeapDumpDir = "/tmp/br_heap_dumps"
 )
 
 func timestampLogFileName() string {
@@ -113,10 +124,6 @@ func DefineCommonFlags(cmd *cobra.Command) {
 	_ = cmd.PersistentFlags().MarkHidden(FlagRedactLog)
 }
 
-const quarterGiB uint64 = 256 * size.MB
-const halfGiB uint64 = 512 * size.MB
-const fourGiB uint64 = 4 * size.GB
-
 func calculateMemoryLimit(memleft uint64) uint64 {
 	// memreserved = f(memleft) = 512MB * memleft / (memleft + 4GB)
 	//  * f(0) = 0
@@ -132,6 +139,47 @@ func calculateMemoryLimit(memleft uint64) uint64 {
 	return memlimit
 }
 
+// setupMemoryMonitoring configures memory limits and starts the memory monitor.
+// It returns an error if the setup fails.
+func setupMemoryMonitoring(ctx context.Context, memTotal, memUsed uint64) error {
+	if memUsed >= memTotal {
+		log.Warn("failed to obtain memory size, skip setting memory limit",
+			zap.Uint64("memused", memUsed), zap.Uint64("memtotal", memTotal))
+		return nil
+	}
+
+	memleft := memTotal - memUsed
+	memlimit := calculateMemoryLimit(memleft)
+	// BR command needs 256 MiB at least, if the left memory is less than 256 MiB,
+	// the memory limit cannot limit anyway and then finally OOM.
+	memlimit = max(memlimit, quarterGiB)
+
+	log.Info("calculate the rest memory",
+		zap.Uint64("memtotal", memTotal),
+		zap.Uint64("memused", memUsed),
+		zap.Uint64("memlimit", memlimit))
+
+	// No need to set memory limit because the left memory is sufficient.
+	if memlimit >= uint64(math.MaxInt64) {
+		return nil
+	}
+
+	debug.SetMemoryLimit(int64(memlimit))
+
+	// Configure and start memory monitoring
+	dumpDir := os.Getenv(envBRHeapDumpDir)
+	if dumpDir == "" {
+		dumpDir = defaultHeapDumpDir
+	}
+
+	if err := utils.RunMemoryMonitor(ctx, dumpDir, memlimit); err != nil {
+		log.Warn("Failed to start memory monitor", zap.Error(err))
+		return err
+	}
+
+	return nil
+}
+
 // Init initializes BR cli.
 func Init(cmd *cobra.Command) (err error) {
 	initOnce.Do(func() {
@@ -198,21 +246,10 @@ func Init(cmd *cobra.Command) (err error) {
 				err = e
 				return
 			}
-			if memused >= memtotal {
-				log.Warn("failed to obtain memory size, skip setting memory limit",
-					zap.Uint64("memused", memused), zap.Uint64("memtotal", memtotal))
-			} else {
-				memleft := memtotal - memused
-				memlimit := calculateMemoryLimit(memleft)
-				// BR command needs 256 MiB at least, if the left memory is less than 256 MiB,
-				// the memory limit cannot limit anyway and then finally OOM.
-				memlimit = max(memlimit, quarterGiB)
-				log.Info("calculate the rest memory",
-					zap.Uint64("memtotal", memtotal), zap.Uint64("memused", memused), zap.Uint64("memlimit", memlimit))
-				// No need to set memory limit because the left memory is sufficient.
-				if memlimit < uint64(math.MaxInt64) {
-					debug.SetMemoryLimit(int64(memlimit))
-				}
+
+			if e := setupMemoryMonitoring(GetDefaultContext(), memtotal, memused); e != nil {
+				// only log the error, don't fail initialization
+				log.Error("Failed to setup memory monitoring", zap.Error(e))
 			}
 		}
 
@@ -227,13 +264,13 @@ func Init(cmd *cobra.Command) (err error) {
 			return
 		}
 		redact.InitRedact(redactLog || redactInfoLog)
-		err = startPProf(cmd)
+		err = startStatusServer(cmd)
 	})
 	return errors.Trace(err)
 }
 
-func startPProf(cmd *cobra.Command) error {
-	// Initialize the pprof server.
+// Initialize the metrics/pprof server.
+func startStatusServer(cmd *cobra.Command) error {
 	statusAddr, err := cmd.Flags().GetString(FlagStatusAddr)
 	if err != nil {
 		return errors.Trace(err)
@@ -249,7 +286,7 @@ func startPProf(cmd *cobra.Command) error {
 	}
 
 	if statusAddr != "" {
-		return utils.StartPProfListener(statusAddr, tls)
+		return utils.StartStatusListener(statusAddr, tls)
 	}
 	utils.StartDynamicPProfListener(tls)
 	return nil

br/cmd/br/main.go

@@ -13,6 +13,7 @@ import (
 func main() {
 	gCtx := context.Background()
 	ctx, cancel := utils.StartExitSingleListener(gCtx)
+	defer cancel()
 
 	rootCmd := &cobra.Command{
 		Use:              "br",
@@ -34,7 +35,6 @@ func main() {
 
 	rootCmd.SetArgs(os.Args[1:])
 	if err := rootCmd.Execute(); err != nil {
-		cancel()
 		log.Error("br failed", zap.Error(err))
 		os.Exit(1) // nolint:gocritic
 	}

br/cmd/br/operator.go

@@ -32,6 +32,8 @@ func newOperatorCommand() *cobra.Command {
 	cmd.AddCommand(newPrepareForSnapshotBackupCommand(
 		"prepare-for-snapshot-backup",
 		"pause gc, schedulers and importing until the program exits, for snapshot backup."))
+	cmd.AddCommand(newForceFlushCommand())
+	cmd.AddCommand(newChecksumCommand())
 	return cmd
 }
 
@@ -52,3 +54,43 @@ func newPrepareForSnapshotBackupCommand(use string, short string) *cobra.Command
 	operator.DefineFlagsForPrepareSnapBackup(cmd.Flags())
 	return cmd
 }
+
+func newChecksumCommand() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "checksum-as",
+		Short: "calculate the checksum with rewrite rules",
+		Long: "Calculate the checksum of the current cluster (specified by `-u`) " +
+			"with applying the rewrite rules generated from a backup (specified by `-s`). " +
+			"This can be used when you have the checksum of upstream elsewhere.",
+		Args: cobra.NoArgs,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			cfg := operator.ChecksumWithRewriteRulesConfig{}
+			if err := cfg.ParseFromFlags(cmd.Flags()); err != nil {
+				return err
+			}
+			ctx := GetDefaultContext()
+			return operator.RunChecksumTable(ctx, tidbGlue, cfg)
+		},
+	}
+	task.DefineFilterFlags(cmd, []string{"!*.*"}, false)
+	operator.DefineFlagsForChecksumTableConfig(cmd.Flags())
+	return cmd
+}
+
+func newForceFlushCommand() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "force-flush",
+		Short: "force a log backup task to flush",
+		Args:  cobra.NoArgs,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			cfg := operator.ForceFlushConfig{}
+			if err := cfg.ParseFromFlags(cmd.Flags()); err != nil {
+				return err
+			}
+			ctx := GetDefaultContext()
+			return operator.RunForceFlush(ctx, &cfg)
+		},
+	}
+	operator.DefineFlagsForForceFlushConfig(cmd.Flags())
+	return cmd
+}

br/pkg/restore/internal/rawkv/BUILD.bazel

@@ -7,6 +7,7 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//br/pkg/restore/utils",
+        "//pkg/metrics",
         "//pkg/util/hack",
         "@com_github_pingcap_errors//:errors",
         "@com_github_tikv_client_go_v2//config",