Merge branch 'master' into msc-fix1

DEPS.bzl

@@ -3012,8 +3012,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:OSxo1R2y6iyAAxbUPL7h1HC/17CNuwNkW2lF1JySJ7k=",
-        version = "v2.0.1-0.20220718080214-86d51ba7eb02",
+        sum = "h1:fCAWVzUJYee1pDqYTBt5j2G1WuUfOL7A2mZoONoaHgs=",
+        version = "v2.0.1-0.20220721031657-e38d2b07de3f",
     )
     go_repository(
         name = "com_github_tikv_pd_client",

Makefile

@@ -438,6 +438,9 @@ 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 \
 		-- //... -//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 \
+		-- //... -//cmd/... -//tests/graceshutdown/... \
+		-//tests/globalkilltest/... -//tests/readonlytest/... -//br/pkg/task:task_test
 
 bazel_build: bazel_ci_prepare
 	mkdir -p bin

bindinfo/bind_test.go

@@ -354,6 +354,26 @@ using
 	require.True(t, tk.NotHasKeywordInOperatorInfo("select * from t1 where exists(select 1 from t2 where t1.id=t2.id)", "semi join"))
 }
 
+func TestBindCTEMerge(t *testing.T) {
+	store, clean := testkit.CreateMockStore(t)
+	defer clean()
+
+	tk := testkit.NewTestKit(t, store)
+	tk.MustExec("use test")
+	tk.MustExec("drop table if exists t1")
+	tk.MustExec("create table t1(id int)")
+	require.True(t, tk.HasPlan("with cte as (select * from t1) select * from cte", "CTEFullScan"))
+	require.False(t, tk.HasPlan("with cte as (select /*+ MERGE() */ * from t1) select * from cte", "CTEFullScan"))
+	tk.MustExec(`
+create global binding for
+	with cte as (select * from t1) select * from cte
+using
+	with cte as (select /*+ MERGE() */ * from t1) select * from cte
+`)
+
+	require.False(t, tk.HasPlan("with cte as (select * from t1) select * from cte", "CTEFullScan"))
+}
+
 // TestBindingSymbolList tests sql with "?, ?, ?, ?", fixes #13871
 func TestBindingSymbolList(t *testing.T) {
 	store, dom, clean := testkit.CreateMockStoreAndDomain(t)

br/pkg/backup/BUILD.bazel

@@ -29,6 +29,7 @@ go_library(
         "//meta",
         "//meta/autoid",
         "//parser/model",
+        "//sessionctx",
         "//statistics/handle",
         "//util",
         "//util/codec",

br/pkg/backup/client.go

@@ -36,6 +36,7 @@ import (
 	"github.com/pingcap/tidb/meta"
 	"github.com/pingcap/tidb/meta/autoid"
 	"github.com/pingcap/tidb/parser/model"
+	"github.com/pingcap/tidb/sessionctx"
 	"github.com/pingcap/tidb/util"
 	"github.com/pingcap/tidb/util/codec"
 	"github.com/pingcap/tidb/util/ranger"
@@ -472,21 +473,31 @@ func skipUnsupportedDDLJob(job *model.Job) bool {
 }
 
 // WriteBackupDDLJobs sends the ddl jobs are done in (lastBackupTS, backupTS] to metaWriter.
-func WriteBackupDDLJobs(metaWriter *metautil.MetaWriter, store kv.Storage, lastBackupTS, backupTS uint64) error {
+func WriteBackupDDLJobs(metaWriter *metautil.MetaWriter, se sessionctx.Context, store kv.Storage, lastBackupTS, backupTS uint64) error {
 	snapshot := store.GetSnapshot(kv.NewVersion(backupTS))
 	snapMeta := meta.NewSnapshotMeta(snapshot)
 	lastSnapshot := store.GetSnapshot(kv.NewVersion(lastBackupTS))
 	lastSnapMeta := meta.NewSnapshotMeta(lastSnapshot)
-	lastSchemaVersion, err := lastSnapMeta.GetSchemaVersion()
+	lastSchemaVersion, err := lastSnapMeta.GetSchemaVersionWithNonEmptyDiff()
 	if err != nil {
 		return errors.Trace(err)
 	}
-	allJobs, err := ddl.GetAllDDLJobs(snapMeta)
+	backupSchemaVersion, err := snapMeta.GetSchemaVersionWithNonEmptyDiff()
+	if err != nil {
+		return errors.Trace(err)
+	}
+
+	version, err := store.CurrentVersion(kv.GlobalTxnScope)
+	if err != nil {
+		return errors.Trace(err)
+	}
+	newestMeta := meta.NewSnapshotMeta(store.GetSnapshot(kv.NewVersion(version.Ver)))
+	allJobs, err := ddl.GetAllDDLJobs(se, newestMeta)
 	if err != nil {
 		return errors.Trace(err)
 	}
 	log.Debug("get all jobs", zap.Int("jobs", len(allJobs)))
-	historyJobs, err := ddl.GetAllHistoryDDLJobs(snapMeta)
+	historyJobs, err := ddl.GetAllHistoryDDLJobs(newestMeta)
 	if err != nil {
 		return errors.Trace(err)
 	}
@@ -500,7 +511,7 @@ func WriteBackupDDLJobs(metaWriter *metautil.MetaWriter, store kv.Storage, lastB
 		}
 
 		if (job.State == model.JobStateDone || job.State == model.JobStateSynced) &&
-			(job.BinlogInfo != nil && job.BinlogInfo.SchemaVersion > lastSchemaVersion) {
+			(job.BinlogInfo != nil && job.BinlogInfo.SchemaVersion > lastSchemaVersion && job.BinlogInfo.SchemaVersion <= backupSchemaVersion) {
 			if job.BinlogInfo.DBInfo != nil {
 				// ignore all placement policy info during incremental backup for now.
 				job.BinlogInfo.DBInfo.PlacementPolicyRef = nil

br/pkg/backup/client_test.go

@@ -280,7 +280,7 @@ func TestSkipUnsupportedDDLJob(t *testing.T) {
 	metaWriter := metautil.NewMetaWriter(s.storage, metautil.MetaFileSize, false, "", &cipher)
 	ctx := context.Background()
 	metaWriter.StartWriteMetasAsync(ctx, metautil.AppendDDL)
-	err = backup.WriteBackupDDLJobs(metaWriter, s.cluster.Storage, lastTS, ts)
+	err = backup.WriteBackupDDLJobs(metaWriter, tk.Session(), s.cluster.Storage, lastTS, ts)
 	require.NoErrorf(t, err, "Error get ddl jobs: %s", err)
 	err = metaWriter.FinishWriteMetas(ctx, metautil.AppendDDL)
 	require.NoError(t, err, "Flush failed", err)

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

@@ -497,7 +497,7 @@ func (local *local) checkRegionScatteredOrReScatter(ctx context.Context, regionI
 	case pdpb.OperatorStatus_SUCCESS:
 		return true, nil
 	default:
-		log.FromContext(ctx).Warn("scatter-region operator status is abnormal, will scatter region again",
+		log.FromContext(ctx).Debug("scatter-region operator status is abnormal, will scatter region again",
 			logutil.Region(regionInfo.Region), zap.Stringer("status", resp.GetStatus()))
 		return false, local.splitCli.ScatterRegion(ctx, regionInfo)
 	}

br/pkg/lightning/lightning.go

@@ -664,7 +664,8 @@ func (l *Lightning) handlePostTask(w http.ResponseWriter, req *http.Request) {
 		writeJSONError(w, http.StatusBadRequest, "cannot read request", err)
 		return
 	}
-	log.L().Info("received task config", zap.ByteString("content", data))
+	filteredData := utils.HideSensitive(string(data))
+	log.L().Info("received task config", zap.String("content", filteredData))
 
 	cfg := config.NewConfig()
 	if err = cfg.LoadFromGlobal(l.globalCfg); err != nil {

br/pkg/restore/db_test.go

@@ -194,7 +194,7 @@ func TestFilterDDLJobs(t *testing.T) {
 	metaWriter := metautil.NewMetaWriter(s.storage, metautil.MetaFileSize, false, "", &cipher)
 	ctx := context.Background()
 	metaWriter.StartWriteMetasAsync(ctx, metautil.AppendDDL)
-	err = backup.WriteBackupDDLJobs(metaWriter, s.mock.Storage, lastTS, ts)
+	err = backup.WriteBackupDDLJobs(metaWriter, tk.Session(), s.mock.Storage, lastTS, ts)
 	require.NoErrorf(t, err, "Error get ddl jobs: %s", err)
 	err = metaWriter.FinishWriteMetas(ctx, metautil.AppendDDL)
 	require.NoErrorf(t, err, "Flush failed", err)
@@ -258,7 +258,7 @@ func TestFilterDDLJobsV2(t *testing.T) {
 	metaWriter := metautil.NewMetaWriter(s.storage, metautil.MetaFileSize, true, "", &cipher)
 	ctx := context.Background()
 	metaWriter.StartWriteMetasAsync(ctx, metautil.AppendDDL)
-	err = backup.WriteBackupDDLJobs(metaWriter, s.mock.Storage, lastTS, ts)
+	err = backup.WriteBackupDDLJobs(metaWriter, tk.Session(), s.mock.Storage, lastTS, ts)
 	require.NoErrorf(t, err, "Error get ddl jobs: %s", err)
 	err = metaWriter.FinishWriteMetas(ctx, metautil.AppendDDL)
 	require.NoErrorf(t, err, "Flush failed", err)

br/pkg/stream/stream_status.go

@@ -36,6 +36,8 @@ type TaskStatus struct {
 	Info backuppb.StreamBackupTaskInfo
 	// paused checks whether the task is paused.
 	paused bool
+	// global checkpoint from storage
+	globalCheckpoint uint64
 	// Checkpoints collects the checkpoints.
 	Checkpoints []Checkpoint
 	// Total QPS of the task in recent seconds.
@@ -130,14 +132,13 @@ func (p *printByTable) AddTask(task TaskStatus) {
 		pTime := oracle.GetTimeFromTS(ts)
 		gap := now.Sub(pTime).Round(time.Second)
 		gapColor := color.New(color.FgGreen)
-		if gap > 5*time.Minute {
+		if gap > 10*time.Minute {
 			gapColor = color.New(color.FgRed)
 		}
 		info := fmt.Sprintf("%s; gap=%s", pTime, gapColor.Sprint(gap))
 		return info
 	}
-	cp := task.GetMinStoreCheckpoint()
-	table.Add("checkpoint[global]", formatTS(cp.TS))
+	table.Add("checkpoint[global]", formatTS(task.globalCheckpoint))
 	p.addCheckpoints(&task, table, formatTS)
 	for store, e := range task.LastErrors {
 		table.Add(fmt.Sprintf("error[store=%d]", store), e.ErrorCode)
@@ -191,16 +192,15 @@ func (p *printByJSON) PrintTasks() {
 		LastError backuppb.StreamBackupError `json:"last_error"`
 	}
 	type jsonTask struct {
-		Name           string           `json:"name"`
-		StartTS        uint64           `json:"start_ts,omitempty"`
-		EndTS          uint64           `json:"end_ts,omitempty"`
-		TableFilter    []string         `json:"table_filter"`
-		Progress       []storeProgress  `json:"progress"`
-		Storage        string           `json:"storage"`
-		CheckpointTS   uint64           `json:"checkpoint"`
-		EstQPS         float64          `json:"estimate_qps"`
-		LastErrors     []storeLastError `json:"last_errors"`
-		AllCheckpoints []Checkpoint     `json:"all_checkpoints"`
+		Name         string           `json:"name"`
+		StartTS      uint64           `json:"start_ts,omitempty"`
+		EndTS        uint64           `json:"end_ts,omitempty"`
+		TableFilter  []string         `json:"table_filter"`
+		Progress     []storeProgress  `json:"progress"`
+		Storage      string           `json:"storage"`
+		CheckpointTS uint64           `json:"checkpoint"`
+		EstQPS       float64          `json:"estimate_qps"`
+		LastErrors   []storeLastError `json:"last_errors"`
 	}
 	taskToJSON := func(t TaskStatus) jsonTask {
 		s := storage.FormatBackendURL(t.Info.GetStorage())
@@ -220,18 +220,16 @@ func (p *printByJSON) PrintTasks() {
 				LastError: lastError,
 			})
 		}
-		cp := t.GetMinStoreCheckpoint()
 		return jsonTask{
-			Name:           t.Info.GetName(),
-			StartTS:        t.Info.GetStartTs(),
-			EndTS:          t.Info.GetEndTs(),
-			TableFilter:    t.Info.GetTableFilter(),
-			Progress:       sp,
-			Storage:        s.String(),
-			CheckpointTS:   cp.TS,
-			EstQPS:         t.QPS,
-			LastErrors:     se,
-			AllCheckpoints: t.Checkpoints,
+			Name:         t.Info.GetName(),
+			StartTS:      t.Info.GetStartTs(),
+			EndTS:        t.Info.GetEndTs(),
+			TableFilter:  t.Info.GetTableFilter(),
+			Progress:     sp,
+			Storage:      s.String(),
+			CheckpointTS: t.globalCheckpoint,
+			EstQPS:       t.QPS,
+			LastErrors:   se,
 		}
 	}
 	mustMarshal := func(i interface{}) string {
@@ -359,6 +357,10 @@ func (ctl *StatusController) fillTask(ctx context.Context, task Task) (TaskStatu
 		return s, errors.Annotatef(err, "failed to get progress of task %s", s.Info.Name)
 	}
 
+	if s.globalCheckpoint, err = task.GetStorageCheckpoint(ctx); err != nil {
+		return s, errors.Annotatef(err, "failed to get storage checkpoint of task %s", s.Info.Name)
+	}
+
 	s.LastErrors, err = task.LastError(ctx)
 	if err != nil {
 		return s, err

br/pkg/streamhelper/advancer.go

@@ -264,13 +264,11 @@ func (c *CheckpointAdvancer) CalculateGlobalCheckpoint(ctx context.Context) (uin
 		nextRun []kv.KeyRange
 	)
 	defer c.recordTimeCost("record all")
-	cx, cancel := context.WithTimeout(ctx, c.cfg.MaxBackoffTime)
-	defer cancel()
 	for {
 		coll := NewClusterCollector(ctx, c.env)
 		coll.setOnSuccessHook(c.cache.InsertRange)
 		for _, u := range thisRun {
-			err := c.GetCheckpointInRange(cx, u.StartKey, u.EndKey, coll)
+			err := c.GetCheckpointInRange(ctx, u.StartKey, u.EndKey, coll)
 			if err != nil {
 				return 0, err
 			}

br/pkg/streamhelper/client.go

@@ -15,6 +15,7 @@ import (
 	berrors "github.com/pingcap/tidb/br/pkg/errors"
 	"github.com/pingcap/tidb/br/pkg/redact"
 	"github.com/pingcap/tidb/kv"
+	"github.com/pingcap/tidb/util/mathutil"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.uber.org/zap"
 )
@@ -299,6 +300,13 @@ type Task struct {
 	Info backuppb.StreamBackupTaskInfo
 }
 
+func NewTask(client *MetaDataClient, info backuppb.StreamBackupTaskInfo) *Task {
+	return &Task{
+		cli:  client,
+		Info: info,
+	}
+}
+
 // Pause is a shorthand for `metaCli.PauseTask`.
 func (t *Task) Pause(ctx context.Context) error {
 	return t.cli.PauseTask(ctx, t.Info.Name)
@@ -352,6 +360,29 @@ func (t *Task) NextBackupTSList(ctx context.Context) ([]Checkpoint, error) {
 	return cps, nil
 }
 
+func (t *Task) GetStorageCheckpoint(ctx context.Context) (uint64, error) {
+	prefix := StorageCheckpointOf(t.Info.Name)
+	scanner := scanEtcdPrefix(t.cli.Client, prefix)
+	kvs, err := scanner.AllPages(ctx, 1024)
+	if err != nil {
+		return 0, errors.Annotatef(err, "failed to get checkpoints of %s", t.Info.Name)
+	}
+
+	var storageCheckpoint = t.Info.StartTs
+	for _, kv := range kvs {
+		if len(kv.Value) != 8 {
+			return 0, errors.Annotatef(berrors.ErrPiTRMalformedMetadata,
+				"the value isn't 64bits (it is %d bytes, value = %s)",
+				len(kv.Value),
+				redact.Key(kv.Value))
+		}
+		ts := binary.BigEndian.Uint64(kv.Value)
+		storageCheckpoint = mathutil.Max(storageCheckpoint, ts)
+	}
+
+	return storageCheckpoint, nil
+}
+
 // MinNextBackupTS query the all next backup ts of a store, returning the minimal next backup ts of the store.
 func (t *Task) MinNextBackupTS(ctx context.Context, store uint64) (uint64, error) {
 	key := CheckPointOf(t.Info.Name, store)

br/pkg/streamhelper/config/advancer_conf.go

@@ -10,13 +10,16 @@ import (
 
 const (
 	flagBackoffTime      = "backoff-time"
-	flagMaxBackoffTime   = "max-backoff-time"
 	flagTickInterval     = "tick-interval"
 	flagFullScanDiffTick = "full-scan-tick"
 	flagAdvancingByCache = "advancing-by-cache"
 
 	DefaultConsistencyCheckTick = 5
 	DefaultTryAdvanceThreshold  = 3 * time.Minute
+	DefaultBackOffTime          = 5 * time.Second
+	DefaultTickInterval         = 12 * time.Second
+	DefaultFullScanTick         = 4
+	DefaultAdvanceByCache       = true
 )
 
 var (
@@ -26,8 +29,6 @@ var (
 type Config struct {
 	// The gap between two retries.
 	BackoffTime time.Duration `toml:"backoff-time" json:"backoff-time"`
-	// When after this time we cannot collect the safe resolved ts, give up.
-	MaxBackoffTime time.Duration `toml:"max-backoff-time" json:"max-backoff-time"`
 	// The gap between calculating checkpoints.
 	TickDuration time.Duration `toml:"tick-interval" json:"tick-interval"`
 	// The backoff time of full scan.
@@ -39,20 +40,18 @@ type Config struct {
 }
 
 func DefineFlagsForCheckpointAdvancerConfig(f *pflag.FlagSet) {
-	f.Duration(flagBackoffTime, 5*time.Second, "The gap between two retries.")
-	f.Duration(flagMaxBackoffTime, 20*time.Minute, "After how long we should advance the checkpoint.")
-	f.Duration(flagTickInterval, 12*time.Second, "From how log we trigger the tick (advancing the checkpoint).")
-	f.Bool(flagAdvancingByCache, true, "Whether enable the optimization -- use a cached heap to advancing the global checkpoint.")
-	f.Int(flagFullScanDiffTick, 4, "The backoff of full scan.")
+	f.Duration(flagBackoffTime, DefaultBackOffTime, "The gap between two retries.")
+	f.Duration(flagTickInterval, DefaultTickInterval, "From how long we trigger the tick (advancing the checkpoint).")
+	f.Bool(flagAdvancingByCache, DefaultAdvanceByCache, "Whether enable the optimization -- use a cached heap to advancing the global checkpoint.")
+	f.Int(flagFullScanDiffTick, DefaultFullScanTick, "The backoff of full scan.")
 }
 
 func Default() Config {
 	return Config{
-		BackoffTime:      5 * time.Second,
-		MaxBackoffTime:   20 * time.Minute,
-		TickDuration:     12 * time.Second,
-		FullScanTick:     4,
-		AdvancingByCache: true,
+		BackoffTime:      DefaultBackOffTime,
+		TickDuration:     DefaultTickInterval,
+		FullScanTick:     DefaultFullScanTick,
+		AdvancingByCache: DefaultAdvanceByCache,
 	}
 }
 
@@ -62,10 +61,6 @@ func (conf *Config) GetFromFlags(f *pflag.FlagSet) error {
 	if err != nil {
 		return err
 	}
-	conf.MaxBackoffTime, err = f.GetDuration(flagMaxBackoffTime)
-	if err != nil {
-		return err
-	}
 	conf.TickDuration, err = f.GetDuration(flagTickInterval)
 	if err != nil {
 		return err