ddl(dm): make skipped ddl pass `SplitDDL()` #4176

okJiang · 2021-12-31T06:25:37Z

What problem does this PR solve?

Issue Number: close #4173

What is changed and how it works?

make ddl which will be skipped in skipQueryEvent() pass SplitDDL, and don't report error.

Check List

Tests

Integration test

Release note

`None`.

ti-chi-bot · 2021-12-31T06:25:38Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

Ehco1996
lance6716

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

okJiang · 2021-12-31T06:28:08Z

dm/pkg/parser/common.go

@@ -318,6 +318,7 @@ func SplitDDL(stmt ast.StmtNode, schema string) (sqls []string, err error) {
 		v.Table = table

 		return sqls, nil
+	case *ast.CreateViewStmt:


How about add all will be skipped in SkipQueryEvent() ddl here? @lance6716

tiflow/dm/pkg/utils/util.go

Lines 45 to 100 in 95ddc8a

builtInSkipDDLs = []string{

// transaction

"^SAVEPOINT",

// skip all flush sqls

"^FLUSH",

// table maintenance

"^OPTIMIZE\\s+TABLE",

"^ANALYZE\\s+TABLE",

"^REPAIR\\s+TABLE",

// temporary table

"^DROP\\s+(\\/\\*\\!40005\\s+)?TEMPORARY\\s+(\\*\\/\\s+)?TABLE",

// trigger

"^CREATE\\s+(DEFINER\\s?=.+?)?TRIGGER",

"^DROP\\s+TRIGGER",

// procedure

"^DROP\\s+PROCEDURE",

"^CREATE\\s+(DEFINER\\s?=.+?)?PROCEDURE",

"^ALTER\\s+PROCEDURE",

// view

"^CREATE\\s*(OR REPLACE)?\\s+(ALGORITHM\\s?=.+?)?(DEFINER\\s?=.+?)?\\s+(SQL SECURITY DEFINER)?VIEW",

"^DROP\\s+VIEW",

"^ALTER\\s+(ALGORITHM\\s?=.+?)?(DEFINER\\s?=.+?)?(SQL SECURITY DEFINER)?VIEW",

// function

// user-defined function

"^CREATE\\s+(AGGREGATE)?\\s*?FUNCTION",

// stored function

"^CREATE\\s+(DEFINER\\s?=.+?)?FUNCTION",

"^ALTER\\s+FUNCTION",

"^DROP\\s+FUNCTION",

// tableSpace

"^CREATE\\s+TABLESPACE",

"^ALTER\\s+TABLESPACE",

"^DROP\\s+TABLESPACE",

// event

"^CREATE\\s+(DEFINER\\s?=.+?)?EVENT",

"^ALTER\\s+(DEFINER\\s?=.+?)?EVENT",

"^DROP\\s+EVENT",

// account management

"^GRANT",

"^REVOKE",

"^CREATE\\s+USER",

"^ALTER\\s+USER",

"^RENAME\\s+USER",

"^DROP\\s+USER",

"^SET\\s+PASSWORD",

}

or we execute

if utils.IsBuildInSkipDDL(qec.originSQL) { return true, nil }

before SpiltDDL

there're more cases than CREATE VIEW. I think we should do as

tiflow/dm/syncer/syncer.go

Lines 2366 to 2380 in 95ddc8a

if err != nil {

// return error if parse fail and filter fail

needSkip, err2 := s.skipSQLByPattern(qec.originSQL)

if err2 != nil {

return err2

}

if !needSkip {

return err

}

// don't return error if parse fail and filter success

metrics.SkipBinlogDurationHistogram.WithLabelValues("query", s.cfg.Name, s.cfg.SourceID).Observe(time.Since(ec.startTime).Seconds())

ec.tctx.L().Warn("skip event", zap.String("event", "query"), zap.Stringer("query event context", qec))

*ec.lastLocation = *ec.currentLocation // before record skip location, update lastLocation

return s.recordSkipSQLsLocation(&ec)

}

codecov-commenter · 2021-12-31T07:40:02Z

Codecov Report

Merging #4176 (e216aa1) into master (08da001) will decrease coverage by 0.0271%.
The diff coverage is 52.5105%.

Flag	Coverage Δ
cdc	`58.4851% <56.5587%> (-0.1597%)`	⬇️
dm	`52.2739% <42.5887%> (+0.0193%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

@@               Coverage Diff                @@
##             master      #4176        +/-   ##
================================================
- Coverage   55.1722%   55.1451%   -0.0272%     
================================================
  Files           485        489         +4     
  Lines         59829      60805       +976     
================================================
+ Hits          33009      33531       +522     
- Misses        23484      23891       +407     
- Partials       3336       3383        +47

okJiang · 2021-12-31T08:37:41Z

/run-dm-integration-test

okJiang · 2021-12-31T09:02:58Z

/run-dm-integration-test

lance6716 · 2021-12-31T09:03:58Z

/run-dm-integration-test

dm/syncer/syncer.go

Ehco1996

restLGTM

dm/tests/all_mode/run.sh

Co-authored-by: Ehco <[email protected]>

lance6716

rest lgtm

dm/syncer/syncer.go

lance6716 · 2022-01-05T02:31:17Z

dm/tests/all_mode/run.sh

@@ -377,6 +377,9 @@ function run() {
 	# use sync_diff_inspector to check full dump loader
 	check_sync_diff $WORK_DIR $cur/conf/diff_config.toml

+	# check create view(should be skipped by func `skipSQLByPattern`) will not stop sync task
+	run_sql_source1 "create view all_mode.t1_v as select * from all_mode.t1 where id=0;"


please add a check about task is not interrupted. Currently the test will fail at line 449, that's too far

Co-authored-by: lance6716 <[email protected]>

okJiang · 2022-01-05T05:37:09Z

/run-all-tests

Ehco1996 · 2022-01-05T05:52:06Z

dm/tests/all_mode/run.sh

+	# test_expression_filter
+	# test_fail_job_between_event
+	# test_session_config
+	# test_query_timeout


please revert this

Ehco1996

LGTM(after addressed all comment)

dm/tests/all_mode/run.sh

okJiang · 2022-01-05T09:15:11Z

Is this pr ready to merge? @lance6716

lance6716 · 2022-01-05T09:21:19Z

/merge

ti-chi-bot · 2022-01-05T09:21:21Z

This pull request has been accepted and is ready to merge.

Commit hash: e216aa1

lance6716 · 2022-01-05T09:37:54Z

/run-leak-test

okJiang · 2022-01-05T09:45:17Z

/run-dm-integration-test

ti-chi-bot · 2022-01-05T10:09:13Z

In response to a cherrypick label: new pull request created: #4227.

ti-chi-bot · 2022-01-05T10:09:49Z

In response to a cherrypick label: new pull request created: #4228.

close #4173

) close pingcap#4173

* fix the txn_batch_size metric inaccuracy bug when the sink target is MQ * address comments * add comments for exported functions * fix the compiling problem * workerpool: limit the rate to output deadlock warning (#3775) (#3795) * tests(ticdc): set up the sync diff output directory correctly (#3725) (#3741) * relay(dm): use binlog name comparison (#3710) (#3712) * dm/load: fix concurrent call Loader.Status (#3459) (#3468) * cdc/sorter: make unified sorter cgroup aware (#3436) (#3439) * tz (ticdc): fix timezone error (#3887) (#3906) * pkg,cdc: do not use log package (#3902) (#3940) * *: rename repo from pingcap/ticdc to pingcap/tiflow (#3959) * http_*: add log for http api and refine the err handle logic (#2997) (#3307) * etcd_worker: batch etcd patch (#3277) (#3389) * http_api (ticdc): check --cert-allowed-cn before add server common name (#3628) (#3882) * kvclient(ticdc): fix kvclient takes too long time to recover (#3612) (#3663) * owner: fix owner tick block http request (#3490) (#3530) * dm/syncer: use downstream PK/UK to generate DML (#3168) (#3256) * dep(dm): update go-mysql (#3914) (#3934) * dm/syncer: multiple rows use downstream schema (#3308) (#3953) * errorutil,sink,syncer: add errorutil to handle ignorable error (#3264) (#3995) * dm/worker: don't exit when failed to read checkpoint in relay (#3345) (#4005) * syncer(dm): use an early location to reset binlog and open safemode (#3860) * ticdc/owner: Fix ddl special comment syntax error (#3845) (#3978) * dm/scheduler: fix inconsistent of relay status (#3474) (#4009) * owner,scheduler(cdc): fix nil pointer panic in owner scheduler (#2980) (#4007) (#4016) * config(ticdc): Fix old value configuration check for maxwell protocol (#3747) (#3783) * sink(ticdc): cherry pick sink bug fix to release 5.3 (#4083) * master(dm): clean and treat invalid load task (#4004) (#4145) * loader: fix wrong progress in query-status for loader (#4093) (#4143) close #3252 * ticdc/processor: Fix backoff base delay misconfiguration (#3992) (#4028) * dm: load table structure from dump files (#3295) (#4163) * compactor: fix duplicate entry in safemode (#3432) (#3434) (#4088) * kv(ticdc): reduce eventfeed rate limited log (#4072) (#4111) close #4006 * metrics(ticdc): add resolved ts and add changefeed to dataflow (#4038) (#4104) * This is an automated cherry-pick of #4192 Signed-off-by: ti-chi-bot <[email protected]> * retry(dm): align with tidb latest error message (#4172) (#4254) close #4159, close #4246 * owner(ticdc): Add bootstrap and try to fix the meta information in it (#3838) (#3865) * redolog: add a precleanup process when s3 enable (#3525) (#3878) * ddl(dm): make skipped ddl pass `SplitDDL()` (#4176) (#4227) close #4173 * cdc/sink: remove Initialize method from the sink interface (#3682) (#3765) Co-authored-by: Ling Jin <[email protected]> * http_api (ticdc): fix http api 'get processor' panic. (#4117) (#4123) close #3840 * sink (ticdc): fix a deadlock due to checkpointTs fall back in sinkNode (#4084) (#4099) close #4055 * cdc/sink: adjust kafka initialization logic (#3192) (#4162) * try fix conflicts. * This is an automated cherry-pick of #4192 Signed-off-by: ti-chi-bot <[email protected]> * fix conflicts. * fix conflicts. Co-authored-by: zhaoxinyu <[email protected]> Co-authored-by: amyangfei <[email protected]> Co-authored-by: lance6716 <[email protected]> Co-authored-by: sdojjy <[email protected]> Co-authored-by: Ling Jin <[email protected]> Co-authored-by: 3AceShowHand <[email protected]>

close pingcap#4173

save work

6d3d3c8

ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 31, 2021

okJiang commented Dec 31, 2021

View reviewed changes

lance6716 added this to the v5.4.0 milestone Dec 31, 2021

lance6716 added area/dm Issues or PRs related to DM. needs-cherry-pick-release-5.3 Should cherry pick this PR to release-5.3 branch. labels Dec 31, 2021

save work

4c40e78

ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 31, 2021

add comment

54f2011

Merge branch 'master' into bug-4173

b921739

Ehco1996 reviewed Jan 4, 2022

View reviewed changes

dm/syncer/syncer.go Show resolved Hide resolved

Ehco1996 reviewed Jan 5, 2022

View reviewed changes

dm/tests/all_mode/run.sh Outdated Show resolved Hide resolved

okJiang and others added 2 commits January 5, 2022 09:58

Update dm/tests/all_mode/run.sh

b5f8b3b

Co-authored-by: Ehco <[email protected]>

add comment

b550c93

lance6716 reviewed Jan 5, 2022

View reviewed changes

okJiang and others added 2 commits January 5, 2022 12:27

Update dm/syncer/syncer.go

b41d047

Co-authored-by: lance6716 <[email protected]>

add check in IT

71e1178

Ehco1996 reviewed Jan 5, 2022

View reviewed changes

Ehco1996 approved these changes Jan 5, 2022

View reviewed changes

ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jan 5, 2022

okJiang commented Jan 5, 2022

View reviewed changes

dm/tests/all_mode/run.sh Outdated Show resolved Hide resolved

Update dm/tests/all_mode/run.sh

6dd1230

lance6716 added the needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. label Jan 5, 2022

lance6716 approved these changes Jan 5, 2022

View reviewed changes

ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jan 5, 2022

Merge branch 'master' into bug-4173

e216aa1

ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 5, 2022

ti-chi-bot added 2 commits January 5, 2022 17:21

Merge branch 'master' into bug-4173

8fd5df0

Merge branch 'master' into bug-4173

fd1a468

ti-chi-bot merged commit e04124a into pingcap:master Jan 5, 2022

ti-chi-bot mentioned this pull request Jan 5, 2022

ddl(dm): make skipped ddl pass SplitDDL() (#4176) #4227

Merged

ti-chi-bot mentioned this pull request Jan 5, 2022

ddl(dm): make skipped ddl pass SplitDDL() (#4176) #4228

Merged

lance6716 pushed a commit that referenced this pull request Jan 5, 2022

ddl(dm): make skipped ddl pass SplitDDL() (#4176)

ca7070c

close #4173

ti-chi-bot added a commit that referenced this pull request Jan 10, 2022

ddl(dm): make skipped ddl pass SplitDDL() (#4176) (#4227)

f8267ec

close #4173

ti-chi-bot added a commit that referenced this pull request Jan 10, 2022

ddl(dm): make skipped ddl pass SplitDDL() (#4176) (#4228)

1129934

close #4173

3AceShowHand pushed a commit to ti-chi-bot/tiflow that referenced this pull request Jan 13, 2022

ddl(dm): make skipped ddl pass SplitDDL() (pingcap#4176) (pingcap#4227

de5de8b

) close pingcap#4173

zhaoxinyu pushed a commit to zhaoxinyu/ticdc that referenced this pull request Jan 20, 2022

ddl(dm): make skipped ddl pass SplitDDL() (pingcap#4176)

c62326d

close pingcap#4173

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ddl(dm): make skipped ddl pass `SplitDDL()` #4176

ddl(dm): make skipped ddl pass `SplitDDL()` #4176

okJiang commented Dec 31, 2021

ti-chi-bot commented Dec 31, 2021 •

edited

Loading

okJiang Dec 31, 2021

okJiang Dec 31, 2021

lance6716 Dec 31, 2021

codecov-commenter commented Dec 31, 2021 •

edited

Loading

okJiang commented Dec 31, 2021

okJiang commented Dec 31, 2021

lance6716 commented Dec 31, 2021

Ehco1996 left a comment

lance6716 left a comment

lance6716 Jan 5, 2022

okJiang commented Jan 5, 2022

Ehco1996 Jan 5, 2022

Ehco1996 left a comment •

edited

Loading

okJiang commented Jan 5, 2022

lance6716 commented Jan 5, 2022

ti-chi-bot commented Jan 5, 2022

lance6716 commented Jan 5, 2022

okJiang commented Jan 5, 2022

ti-chi-bot commented Jan 5, 2022

ti-chi-bot commented Jan 5, 2022

	builtInSkipDDLs = []string{
	// transaction
	"^SAVEPOINT",

	// skip all flush sqls
	"^FLUSH",

	// table maintenance
	"^OPTIMIZE\\s+TABLE",
	"^ANALYZE\\s+TABLE",
	"^REPAIR\\s+TABLE",

	// temporary table
	"^DROP\\s+(\\/\\\\!40005\\s+)?TEMPORARY\\s+(\\\\/\\s+)?TABLE",

	// trigger
	"^CREATE\\s+(DEFINER\\s?=.+?)?TRIGGER",
	"^DROP\\s+TRIGGER",

	// procedure
	"^DROP\\s+PROCEDURE",
	"^CREATE\\s+(DEFINER\\s?=.+?)?PROCEDURE",
	"^ALTER\\s+PROCEDURE",

	// view
	"^CREATE\\s*(OR REPLACE)?\\s+(ALGORITHM\\s?=.+?)?(DEFINER\\s?=.+?)?\\s+(SQL SECURITY DEFINER)?VIEW",
	"^DROP\\s+VIEW",
	"^ALTER\\s+(ALGORITHM\\s?=.+?)?(DEFINER\\s?=.+?)?(SQL SECURITY DEFINER)?VIEW",

	// function
	// user-defined function
	"^CREATE\\s+(AGGREGATE)?\\s*?FUNCTION",
	// stored function
	"^CREATE\\s+(DEFINER\\s?=.+?)?FUNCTION",
	"^ALTER\\s+FUNCTION",
	"^DROP\\s+FUNCTION",

	// tableSpace
	"^CREATE\\s+TABLESPACE",
	"^ALTER\\s+TABLESPACE",
	"^DROP\\s+TABLESPACE",

	// event
	"^CREATE\\s+(DEFINER\\s?=.+?)?EVENT",
	"^ALTER\\s+(DEFINER\\s?=.+?)?EVENT",
	"^DROP\\s+EVENT",

	// account management
	"^GRANT",
	"^REVOKE",
	"^CREATE\\s+USER",
	"^ALTER\\s+USER",
	"^RENAME\\s+USER",
	"^DROP\\s+USER",
	"^SET\\s+PASSWORD",
	}

	if err != nil {
	// return error if parse fail and filter fail
	needSkip, err2 := s.skipSQLByPattern(qec.originSQL)
	if err2 != nil {
	return err2
	}
	if !needSkip {
	return err
	}
	// don't return error if parse fail and filter success
	metrics.SkipBinlogDurationHistogram.WithLabelValues("query", s.cfg.Name, s.cfg.SourceID).Observe(time.Since(ec.startTime).Seconds())
	ec.tctx.L().Warn("skip event", zap.String("event", "query"), zap.Stringer("query event context", qec))
	ec.lastLocation = ec.currentLocation // before record skip location, update lastLocation
	return s.recordSkipSQLsLocation(&ec)
	}

ddl(dm): make skipped ddl pass SplitDDL() #4176

ddl(dm): make skipped ddl pass SplitDDL() #4176

Conversation

okJiang commented Dec 31, 2021

What problem does this PR solve?

What is changed and how it works?

Check List

Release note

ti-chi-bot commented Dec 31, 2021 • edited Loading

okJiang Dec 31, 2021

Choose a reason for hiding this comment

okJiang Dec 31, 2021

Choose a reason for hiding this comment

lance6716 Dec 31, 2021

Choose a reason for hiding this comment

codecov-commenter commented Dec 31, 2021 • edited Loading

Codecov Report

okJiang commented Dec 31, 2021

okJiang commented Dec 31, 2021

lance6716 commented Dec 31, 2021

Ehco1996 left a comment

Choose a reason for hiding this comment

lance6716 left a comment

Choose a reason for hiding this comment

lance6716 Jan 5, 2022

Choose a reason for hiding this comment

okJiang commented Jan 5, 2022

Ehco1996 Jan 5, 2022

Choose a reason for hiding this comment

Ehco1996 left a comment • edited Loading

Choose a reason for hiding this comment

okJiang commented Jan 5, 2022

lance6716 commented Jan 5, 2022

ti-chi-bot commented Jan 5, 2022

lance6716 commented Jan 5, 2022

okJiang commented Jan 5, 2022

ti-chi-bot commented Jan 5, 2022

ti-chi-bot commented Jan 5, 2022

ddl(dm): make skipped ddl pass `SplitDDL()` #4176

ddl(dm): make skipped ddl pass `SplitDDL()` #4176

ti-chi-bot commented Dec 31, 2021 •

edited

Loading

codecov-commenter commented Dec 31, 2021 •

edited

Loading

Ehco1996 left a comment •

edited

Loading