Revert "*: when placement conflicts with tiflash, cancel the job (pin…

…gcap#30945)" This reverts commit b53f349.
Reminiscent · Dec 23, 2021 · 1bbc14a · 1bbc14a
1 parent 9e6e687
commit 1bbc14a
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/ddl/table.go b/ddl/table.go
@@ -955,7 +955,6 @@ func (w *worker) onSetTableFlashReplica(t *meta.Meta, job *model.Job) (ver int64
 	}
 
 	if replicaInfo.Count > 0 && tableHasPlacementSettings(tblInfo) {
-		job.State = model.JobStateCancelled
 		return ver, errors.Trace(ErrIncompatibleTiFlashAndPlacement)
 	}
 
@@ -1280,7 +1279,6 @@ func onAlterTablePartitionPlacement(t *meta.Meta, job *model.Job) (ver int64, er
 	}
 
 	if tblInfo.TiFlashReplica != nil && tblInfo.TiFlashReplica.Count > 0 {
-		job.State = model.JobStateCancelled
 		return 0, errors.Trace(ErrIncompatibleTiFlashAndPlacement)
 	}
 
@@ -1352,7 +1350,6 @@ func onAlterTablePlacement(d *ddlCtx, t *meta.Meta, job *model.Job) (ver int64,
 	}
 
 	if tblInfo.TiFlashReplica != nil && tblInfo.TiFlashReplica.Count > 0 {
-		job.State = model.JobStateCancelled
 		return 0, errors.Trace(ErrIncompatibleTiFlashAndPlacement)
 	}