From 1bbc14ae22eefb0a70b6304d9fa634bc4b170064 Mon Sep 17 00:00:00 2001 From: Reminiscent Date: Thu, 23 Dec 2021 10:54:52 +0800 Subject: [PATCH] Revert "*: when placement conflicts with tiflash, cancel the job (#30945)" This reverts commit b53f3499a61e5e9c5f6e9318144bc657e6bf7cd8. --- ddl/table.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/ddl/table.go b/ddl/table.go index 625b4f39df759..83f7ad0b0e58a 100644 --- 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) }