Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

binlog-filter: log error instead of return it (#10380) #10383

Merged
merged 2 commits into from
Dec 28, 2023
Merged

binlog-filter: log error instead of return it (#10380) #10383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1d6fb4
This is an automated cherry-pick of #10380
GMHDBJD Dec 28, 2023
d809383
resolve conflicts
GMHDBJD Dec 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dm/tests/all_mode/conf/dm-task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ filters: # filter rules, mysql instance can ref rules in it
user-filter-1:
schema-pattern: "*" # pattern of the upstream schema name, wildcard characters (*?) are supported
table-pattern: "*" # pattern of the upstream table name, wildcard characters (*?) are supported
events: ["truncate table", "drop table"] # ignore truncate/drop table ddl
events: ["truncate table", "drop table", "truncate"] # ignore truncate/drop table ddl
action: Ignore

mydumpers:
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ require (
github.com/pingcap/kvproto v0.0.0-20230928035022-1bdcc25ed63c
github.com/pingcap/log v1.1.1-0.20221116035753-734d527bc87c
github.com/pingcap/tidb v1.1.0-beta.0.20231124055343-a06279f27e4c
github.com/pingcap/tidb-tools v7.0.1-0.20230410100500-0bbe5f0cd5c9+incompatible
github.com/pingcap/tidb-tools v7.0.1-0.20231228094724-d6c7fc83380a+incompatible
github.com/pingcap/tidb/parser v0.0.0-20231124055343-a06279f27e4c
github.com/prometheus/client_golang v1.13.0
github.com/prometheus/client_model v0.2.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1058,8 +1058,8 @@ github.com/pingcap/tidb v1.1.0-beta.0.20220511160835-98c31070d958/go.mod h1:luW4
github.com/pingcap/tidb v1.1.0-beta.0.20231124055343-a06279f27e4c h1:P8wqoBhtW+jrY8nMGxWhpKC+zp4wTm/jZH3/I19tm1E=
github.com/pingcap/tidb v1.1.0-beta.0.20231124055343-a06279f27e4c/go.mod h1:6gR6jnvljZJ2JuNIhKGuL32aQAo2i/vmBEmQ3RQUMFg=
github.com/pingcap/tidb-dashboard v0.0.0-20220117082709-e8076b5c79ba/go.mod h1:4hk/3owVGWdvI9Kx6yCqqvM1T5PVgwyQNyMQxD3rwfc=
github.com/pingcap/tidb-tools v7.0.1-0.20230410100500-0bbe5f0cd5c9+incompatible h1:LVju+7gUyr1tkM5ixlISEMagwsBPrJTMm90t4MIUyMw=
github.com/pingcap/tidb-tools v7.0.1-0.20230410100500-0bbe5f0cd5c9+incompatible/go.mod h1:XGdcy9+yqlDSEMTpOXnwf3hiTeqrV6MN/u1se9N8yIM=
github.com/pingcap/tidb-tools v7.0.1-0.20231228094724-d6c7fc83380a+incompatible h1:D4NV5MQhR3WZZzYITVPKrzAkqLK+ue9caUvfAcdAMsE=
github.com/pingcap/tidb-tools v7.0.1-0.20231228094724-d6c7fc83380a+incompatible/go.mod h1:XGdcy9+yqlDSEMTpOXnwf3hiTeqrV6MN/u1se9N8yIM=
github.com/pingcap/tidb/parser v0.0.0-20211011031125-9b13dc409c5e/go.mod h1:e1MGCA9Sg3T8jid8PKAEq5eYVuMMCq4n8gJ+Kqp4Plg=
github.com/pingcap/tidb/parser v0.0.0-20220511160835-98c31070d958/go.mod h1:ElJiub4lRy6UZDb+0JHDkGEdr6aOli+ykhyej7VCLoI=
github.com/pingcap/tidb/parser v0.0.0-20221126021158-6b02a5d8ba7d/go.mod h1:ElJiub4lRy6UZDb+0JHDkGEdr6aOli+ykhyej7VCLoI=
Expand Down
Loading