sink(ticdc): add one errors to ddl unretryable black list. (pingcap#8088

) (pingcap#8389) close pingcap#8087
asddongmen · Feb 28, 2023 · db2e700 · db2e700
1 parent 0c7720b
commit db2e700
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/cdc/sinkv2/ddlsink/mysql/mysql_ddl_sink.go b/cdc/sinkv2/ddlsink/mysql/mysql_ddl_sink.go
@@ -97,6 +97,10 @@ func NewMySQLDDLSink(
 
 func (m *mysqlDDLSink) WriteDDLEvent(ctx context.Context, ddl *model.DDLEvent) error {
 	err := m.execDDLWithMaxRetries(ctx, ddl)
+	// we should not retry changefeed if DDL failed by return an unretryable error.
+	if !errorutil.IsRetryableDDLError(err) {
+		return cerror.WrapChangefeedUnretryableErr(err)
+	}
 	return errors.Trace(err)
 }
 
@@ -125,7 +129,7 @@ func (m *mysqlDDLSink) execDDLWithMaxRetries(ctx context.Context, ddl *model.DDL
 	}, retry.WithBackoffBaseDelay(pmysql.BackoffBaseDelay.Milliseconds()),
 		retry.WithBackoffMaxDelay(pmysql.BackoffMaxDelay.Milliseconds()),
 		retry.WithMaxTries(defaultDDLMaxRetry),
-		retry.WithIsRetryableErr(cerror.IsRetryableError))
+		retry.WithIsRetryableErr(errorutil.IsRetryableDDLError))
 }
 
 func (m *mysqlDDLSink) execDDL(pctx context.Context, ddl *model.DDLEvent) error {

diff --git a/pkg/errorutil/util.go b/pkg/errorutil/util.go
@@ -130,7 +130,8 @@ func IsRetryableDDLError(err error) bool {
 		mysql.ErrNoSuchTable,
 		mysql.ErrNoSuchIndex,
 		mysql.ErrKeyColumnDoesNotExits,
-		mysql.ErrWrongColumnName:
+		mysql.ErrWrongColumnName,
+		mysql.ErrPartitionMgmtOnNonpartitioned:
 		return false
 	}
 	return true

diff --git a/pkg/errorutil/util_test.go b/pkg/errorutil/util_test.go
@@ -95,7 +95,6 @@ func TestIsRetryableDDLError(t *testing.T) {
 		err error
 		ret bool
 	}{
-		{nil, false},
 		{errors.New("raw error"), false},
 		{newMysqlErr(tmysql.ErrNoDB, "Error: Duplicate key name 'some_key'"), false},
 		{newMysqlErr(tmysql.ErrParse, "Can't create database"), false},
@@ -105,6 +104,7 @@ func TestIsRetryableDDLError(t *testing.T) {
 		{newMysqlErr(tmysql.ErrNoSuchIndex, "index not exist"), false},
 		{newMysqlErr(tmysql.ErrWrongColumnName, "wrong column name'"), false},
 		{newMysqlErr(tmysql.ErrDupKeyName, "Duplicate key name 'some_key'"), true},
+		{newMysqlErr(tmysql.ErrPartitionMgmtOnNonpartitioned, "xx"), false},
 	}
 
 	for _, c := range cases {