From b53f3499a61e5e9c5f6e9318144bc657e6bf7cd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E8=B6=85?= Date: Thu, 23 Dec 2021 01:01:48 +0800 Subject: [PATCH] *: when placement conflicts with tiflash, cancel the job (#30945) --- ddl/table.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ddl/table.go b/ddl/table.go index 83f7ad0b0e58a..625b4f39df759 100644 --- 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) }