*: when placement conflicts with tiflash, cancel the job (pingcap#30945)

Reminiscent · Dec 22, 2021 · b53f349 · b53f349
1 parent efb5330
commit b53f349
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/ddl/table.go b/ddl/table.go
@@ -955,6 +955,7 @@ 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)
  }
 
@@ -1279,6 +1280,7 @@ 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)
  }
 
@@ -1350,6 +1352,7 @@ 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)
  }