set skip and redirect error message for now

pingcap · Mar 17, 2022 · 3345f53 · 3345f53
1 parent a458bf7
commit 3345f53
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/dm/dm/master/shardddl/optimist.go b/dm/dm/master/shardddl/optimist.go
@@ -744,6 +744,7 @@ func (o *Optimist) handleLock(info optimism.Info, tts []optimism.TargetTable, sk
 		switch {
 		case terror.ErrShardDDLOptimismNeedSkipAndRedirect.Equal(err):
 			cfStage = optimism.ConflictSkipWaitRedirect
+			cfMsg = err.Error()
 			o.logger.Warn("Please make sure all sharding tables execute this DDL in order", log.ShortError(err))
 		case terror.ErrShardDDLOptimismTrySyncFail.Equal(err):
 			cfStage = optimism.ConflictDetected

diff --git a/dm/syncer/optimist.go b/dm/syncer/optimist.go
@@ -179,13 +179,11 @@ func (s *Syncer) handleQueryEventOptimistic(qec *queryEventContext) error {
 		}
 	}
 
-	if op.ConflictStage == optimism.ConflictError {
-		return terror.ErrSyncerShardDDLConflict.Generate(qec.needHandleDDLs, op.ConflictMsg)
-	}
 	// TODO: support redirect for DM worker
 	// return error to pass IT now
-	if op.ConflictStage == optimism.ConflictSkipWaitRedirect {
-		return terror.ErrSyncerShardDDLConflict.Generate(qec.needHandleDDLs, "there will be conflicts if DDLs .* are applied to the downstream. old table info: .*, new table info: .*")
+	switch op.ConflictStage {
+	case optimism.ConflictError, optimism.ConflictSkipWaitRedirect:
+		return terror.ErrSyncerShardDDLConflict.Generate(qec.needHandleDDLs, op.ConflictMsg)
 	}
 
 	// updated needHandleDDLs to DDLs received from DM-master.