diff --git a/cdc/owner.go b/cdc/owner.go index 72f555e5cb0..e1786c2735e 100644 --- a/cdc/owner.go +++ b/cdc/owner.go @@ -30,7 +30,6 @@ import ( "github.com/pingcap/ticdc/cdc/roles" "github.com/pingcap/ticdc/cdc/roles/storage" "github.com/pingcap/ticdc/cdc/schema" - "github.com/pingcap/tidb/store/tikv/oracle" "go.uber.org/zap" ) @@ -494,18 +493,7 @@ func (o *ownerImpl) calcResolvedTs() error { minCheckpointTs := cfInfo.TargetTs if len(cfInfo.tables) == 0 { - var ts uint64 - - physical, logical, err := o.pdClient.GetTS(context.Background()) - if err != nil { - log.Warn("get ts from pd failed", zap.Error(err)) - continue - } - - ts = oracle.ComposeTS(physical, logical) - - minResolvedTs = ts - minCheckpointTs = ts + minCheckpointTs = cfInfo.CheckpointTs } else { // calc the min of all resolvedTs in captures for _, pStatus := range cfInfo.ProcessorInfos { diff --git a/cdc/schema/storage.go b/cdc/schema/storage.go index de8aed04011..443cc4025bb 100644 --- a/cdc/schema/storage.go +++ b/cdc/schema/storage.go @@ -270,7 +270,7 @@ func (s *Storage) HandlePreviousDDLJobIfNeed(commitTs uint64) error { var job *model.Job for i, job = range s.jobs { if skipJob(job) { - log.Debug("skip ddl job", zap.Stringer("job", job)) + log.Info("skip ddl job", zap.Stringer("job", job)) continue }