Merge branch 'pingcap:master' into fix-merge-join-test

DEPS.bzl

@@ -3495,8 +3495,8 @@ def go_deps():
         name = "com_github_tikv_client_go_v2",
         build_file_proto_mode = "disable_global",
         importpath = "github.com/tikv/client-go/v2",
-        sum = "h1:x5L32xr5KE2C0UhlKfrsDTWQ/8fpFYQLq5xn+ph0sQ0=",
-        version = "v2.0.3-0.20221103084528-ec1202a9d26f",
+        sum = "h1:nFVdyTXcQYZwQQCdSJcFI1vBFyzG1hVuZ39MAK6wqK4=",
+        version = "v2.0.3-0.20221108030801-9c0835c80eba",
     )
     go_repository(
         name = "com_github_tikv_pd_client",

WORKSPACE

@@ -29,7 +29,7 @@ go_rules_dependencies()
 
 go_register_toolchains(
     nogo = "@//build:tidb_nogo",
-    version = "1.19.2",
+    version = "1.19.3",
 )
 
 gazelle_dependencies()

autoid_service/BUILD.bazel

@@ -6,6 +6,7 @@ go_library(
     importpath = "github.com/pingcap/tidb/autoid_service",
     visibility = ["//visibility:public"],
     deps = [
+        "//config",
         "//kv",
         "//meta",
         "//metrics",
@@ -16,6 +17,7 @@ go_library(
         "@com_github_pingcap_kvproto//pkg/autoid",
         "@io_etcd_go_etcd_client_v3//:client",
         "@org_golang_google_grpc//:grpc",
+        "@org_golang_google_grpc//keepalive",
         "@org_uber_go_zap//:zap",
     ],
 )

autoid_service/autoid.go

@@ -16,12 +16,14 @@ package autoid
 
 import (
 	"context"
+	"crypto/tls"
 	"math"
 	"sync"
 	"time"
 
 	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/autoid"
+	"github.com/pingcap/tidb/config"
 	"github.com/pingcap/tidb/kv"
 	"github.com/pingcap/tidb/meta"
 	"github.com/pingcap/tidb/metrics"
@@ -31,6 +33,7 @@ import (
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/keepalive"
 )
 
 var (
@@ -245,10 +248,22 @@ type Service struct {
 }
 
 // New return a Service instance.
-func New(selfAddr string, etcdAddr []string, store kv.Storage) *Service {
+func New(selfAddr string, etcdAddr []string, store kv.Storage, tlsConfig *tls.Config) *Service {
+	cfg := config.GetGlobalConfig()
+	etcdLogCfg := zap.NewProductionConfig()
 	cli, err := clientv3.New(clientv3.Config{
-		Endpoints:   etcdAddr,
-		DialTimeout: time.Second,
+		LogConfig:        &etcdLogCfg,
+		Endpoints:        etcdAddr,
+		AutoSyncInterval: 30 * time.Second,
+		DialTimeout:      5 * time.Second,
+		DialOptions: []grpc.DialOption{
+			grpc.WithBackoffMaxDelay(time.Second * 3),
+			grpc.WithKeepaliveParams(keepalive.ClientParameters{
+				Time:    time.Duration(cfg.TiKVClient.GrpcKeepAliveTime) * time.Second,
+				Timeout: time.Duration(cfg.TiKVClient.GrpcKeepAliveTimeout) * time.Second,
+			}),
+		},
+		TLS: tlsConfig,
 	})
 	if err != nil {
 		panic(err)

br/pkg/restore/BUILD.bazel

@@ -149,7 +149,6 @@ go_test(
         "//testkit/testsetup",
         "//types",
         "//util/codec",
-        "//util/mathutil",
         "@com_github_fsouza_fake_gcs_server//fakestorage",
         "@com_github_golang_protobuf//proto",
         "@com_github_pingcap_errors//:errors",

br/pkg/restore/log_client_test.go

@@ -300,12 +300,19 @@ func testReadFromMetadataWithVersion(t *testing.T, m metaMaker) {
 
 		meta := new(StreamMetadataSet)
 		meta.Helper = stream.NewMetadataHelper()
-		meta.LoadUntil(ctx, loc, c.untilTS)
+		meta.LoadUntilAndCalculateShiftTS(ctx, loc, c.untilTS)
 
 		var metas []*backuppb.Metadata
-		for _, m := range meta.metadata {
+		for path := range meta.metadataInfos {
+			data, err := loc.ReadFile(ctx, path)
+			require.NoError(t, err)
+
+			m, err := meta.Helper.ParseToMetadataHard(data)
+			require.NoError(t, err)
+
 			metas = append(metas, m)
 		}
+
 		actualStoreIDs := make([]int64, 0, len(metas))
 		for _, meta := range metas {
 			actualStoreIDs = append(actualStoreIDs, meta.StoreId)