*(cdc): accept access denied error when query tidb_version (#11129) (#…

…11139) close #11128
pingcap · May 26, 2024 · c3460e2 · c3460e2
1 parent 9ba53d5
commit c3460e2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/cdc/sink/dmlsink/txn/mysql/mysql_test.go b/cdc/sink/dmlsink/txn/mysql/mysql_test.go
@@ -91,9 +91,10 @@ func newTestMockDB(t *testing.T) (db *sql.DB, mock sqlmock.Sqlmock) {
 		Number:  1305,
 		Message: "FUNCTION test.tidb_version does not exist",
 	})
+	// mock a different possible error for the second query
 	mock.ExpectQuery("select tidb_version()").WillReturnError(&dmysql.MySQLError{
-		Number:  1305,
-		Message: "FUNCTION test.tidb_version does not exist",
+		Number:  1044,
+		Message: "Access denied for user 'cdc'@'%' to database 'information_schema'",
 	})
 	require.Nil(t, err)
 	return

diff --git a/pkg/sink/mysql/db_helper.go b/pkg/sink/mysql/db_helper.go
@@ -305,7 +305,7 @@ func CheckIsTiDB(ctx context.Context, db *sql.DB) (bool, error) {
 		log.Error("check tidb version error", zap.Error(err))
 		// downstream is not TiDB, do nothing
 		if mysqlErr, ok := errors.Cause(err).(*dmysql.MySQLError); ok && (mysqlErr.Number == tmysql.ErrNoDB ||
-			mysqlErr.Number == tmysql.ErrSpDoesNotExist) {
+			mysqlErr.Number == tmysql.ErrSpDoesNotExist || mysqlErr.Number == tmysql.ErrDBaccessDenied) {
 			return false, nil
 		}
 		return false, errors.Trace(err)