Skip to content

Commit 6287942

Browse files
hongyunyanwlwilliamx
authored andcommitted
ddl: disable wait Async DDL Done (#3330)
ref #3329
1 parent b9f40d0 commit 6287942

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

pkg/sink/mysql/mysql_writer.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@ func (w *Writer) SetTableSchemaStore(tableSchemaStore *util.TableSchemaStore) {
109109
}
110110

111111
func (w *Writer) FlushDDLEvent(event *commonEvent.DDLEvent) error {
112-
if w.cfg.IsTiDB {
113-
// first we check whether there is some async ddl executed now.
114-
w.waitAsyncDDLDone(event)
115-
}
112+
// if w.cfg.IsTiDB {
113+
// // first we check whether there is some async ddl executed now.
114+
// w.waitAsyncDDLDone(event)
115+
// }
116116
if w.cfg.IsTiDB || !event.TiDBOnly {
117117
// we write ddl ts before ddl first, and update the ddl ts item after ddl executed,
118118
// to ensure the atomic with ddl writing when server is restarted.

pkg/sink/mysql/mysql_writer_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,14 @@ import (
2121
"time"
2222

2323
"github.com/DATA-DOG/go-sqlmock"
24-
"github.com/go-sql-driver/mysql"
2524
lru "github.com/hashicorp/golang-lru"
2625
"github.com/pingcap/errors"
27-
"github.com/pingcap/log"
2826
"github.com/pingcap/ticdc/heartbeatpb"
2927
"github.com/pingcap/ticdc/pkg/common"
3028
commonEvent "github.com/pingcap/ticdc/pkg/common/event"
3129
cerror "github.com/pingcap/ticdc/pkg/errors"
3230
"github.com/pingcap/ticdc/pkg/metrics"
3331
"github.com/pingcap/ticdc/pkg/sink/util"
34-
timodel "github.com/pingcap/tidb/pkg/meta/model"
3532
"github.com/pingcap/tidb/pkg/sessionctx/variable"
3633
"github.com/stretchr/testify/require"
3734
)
@@ -434,6 +431,7 @@ func TestMysqlWriter_RemoveDDLTsTable(t *testing.T) {
434431
require.NoError(t, err)
435432
}
436433

434+
/*
437435
// Test the async ddl can be write successfully
438436
func TestMysqlWriter_AsyncDDL(t *testing.T) {
439437
writer, db, mock := newTestMysqlWriterForTiDB(t)
@@ -622,6 +620,7 @@ func TestMysqlWriter_AsyncDDL(t *testing.T) {
622620
err = mock.ExpectationsWereMet()
623621
require.NoError(t, err)
624622
}
623+
*/
625624

626625
func TestCheckIsDuplicateEntryError(t *testing.T) {
627626
writer, db, _ := newTestMysqlWriter(t)

tests/integration_tests/run_heavy_it_in_ci.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ mysql_groups=(
5252
'resolve_lock merge_table drop_many_tables'
5353
# G10
5454
# 'consistent_replicate_nfs consistent_replicate_storage_file consistent_replicate_storage_file_large_value consistent_replicate_storage_s3'
55-
'multi_changefeeds ddl_wait'
55+
# 'multi_changefeeds ddl_wait'
56+
'multi_changefeeds'
5657
# G11
5758
'ddl_reentrant force_replicate_table multi_source'
5859
# G12

0 commit comments

Comments
 (0)