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

Jump to bottom

lightning: make OpLevelOptional suppress the error of DoChecksum #45486

Merged
merged 9 commits into from
Aug 7, 2023
Merged

lightning: make OpLevelOptional suppress the error of DoChecksum #45486

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f25aabb
lightning: make OpLevelOptional suppress the error of DoChecksum
lyzx2001 Jul 20, 2023
7caa461
lightning: make OpLevelOptional suppress the error of DoChecksum
lyzx2001 Jul 20, 2023
0f060b6
lightning: make OpLevelOptional suppress the error of DoChecksum
lyzx2001 Jul 20, 2023
4f24e14
lightning: make OpLevelOptional suppress the error of DoChecksum
lyzx2001 Jul 24, 2023
45bb013
lightning: make OpLevelOptional suppress the error of DoChecksum
lyzx2001 Jul 24, 2023
bfc940a
lightning: make OpLevelOptional suppress the error of DoChecksum
lyzx2001 Jul 24, 2023
39d8c16
lightning: make OpLevelOptional suppress the error of DoChecksum
lyzx2001 Jul 24, 2023
3b801d9
lightning: make OpLevelOptional suppress the error of DoChecksum
lyzx2001 Aug 2, 2023
fec2e13
lightning: make OpLevelOptional suppress the error of DoChecksum
lyzx2001 Aug 2, 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
3 changes: 3 additions & 0 deletions br/pkg/lightning/importer/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ go_library(
"//br/pkg/lightning/verification",
"//br/pkg/lightning/web",
"//br/pkg/lightning/worker",
"//br/pkg/logutil",
"//br/pkg/pdutil",
"//br/pkg/redact",
"//br/pkg/storage",
Expand Down Expand Up @@ -86,6 +87,8 @@ go_library(
"@com_github_tikv_pd_client//:client",
"@io_etcd_go_etcd_client_v3//:client",
"@org_golang_google_grpc//:grpc",
"@org_golang_google_grpc//codes",
"@org_golang_google_grpc//status",
"@org_golang_x_exp//maps",
"@org_golang_x_exp//slices",
"@org_golang_x_sync//errgroup",
Expand Down
13 changes: 13 additions & 0 deletions br/pkg/lightning/importer/table_import.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
verify "github.com/pingcap/tidb/br/pkg/lightning/verification"
"github.com/pingcap/tidb/br/pkg/lightning/web"
"github.com/pingcap/tidb/br/pkg/lightning/worker"
"github.com/pingcap/tidb/br/pkg/logutil"
"github.com/pingcap/tidb/br/pkg/version"
"github.com/pingcap/tidb/errno"
tidbkv "github.com/pingcap/tidb/kv"
Expand All @@ -54,6 +55,8 @@
"go.uber.org/multierr"
"go.uber.org/zap"
"golang.org/x/exp/slices"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)

// TableImporter is a helper struct to import a table.
Expand Down Expand Up @@ -1034,6 +1037,16 @@

var remoteChecksum *local.RemoteChecksum
remoteChecksum, err = DoChecksum(ctx, tr.tableInfo)
failpoint.Inject("checksum-error", func() {
logutil.CL(ctx).Debug("failpoint checksum-error injected.")
lance6716 marked this conversation as resolved.
Show resolved Hide resolved
err = status.Error(codes.Unknown, "Checksum meets error.")
lance6716 marked this conversation as resolved.
Show resolved Hide resolved
})
if rc.cfg.PostRestore.Checksum == config.OpLevelOptional {
if err != nil {
lance6716 marked this conversation as resolved.
Show resolved Hide resolved
tr.logger.Warn("do checksum failed, will skip this error and go on", log.ShortError(err))
err = nil
}

Check warning on line 1048 in br/pkg/lightning/importer/table_import.go

View check run for this annotation

Codecov / codecov/patch

br/pkg/lightning/importer/table_import.go#L1040-L1048 

Added lines #L1040 - L1048 were not covered by tests
}
if err != nil {
return false, err
}
Expand Down
3 changes: 3 additions & 0 deletions br/tests/lightning_routes/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ schema-pattern = "routes_a*"
table-pattern = "t*"
target-schema = "routes_b"
target-table = "u"

[post-restore]
checksum = "optional"
5 changes: 5 additions & 0 deletions br/tests/lightning_routes/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,17 @@

set -eux

echo "testing checksum-error..."
export GO_FAILPOINTS="github.com/pingcap/tidb/br/pkg/lightning/importer/checksum-error=1*return(true)"
lance6716 marked this conversation as resolved.
Show resolved Hide resolved

run_sql 'DROP DATABASE IF EXISTS routes_a0;'
run_sql 'DROP DATABASE IF EXISTS routes_a1;'
run_sql 'DROP DATABASE IF EXISTS routes_b;'

run_lightning

echo "test checksum-error success!"

run_sql 'SELECT count(1), sum(x) FROM routes_b.u;'
check_contains 'count(1): 4'
check_contains 'sum(x): 259'
Expand Down