Skip to content
This repository has been archived by the owner on Jul 24, 2024. It is now read-only.

checksum: fix SEGFAULT during backup #455

Merged
merged 2 commits into from
Aug 11, 2020
Merged

checksum: fix SEGFAULT during backup #455

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08307f7
checksum: fix SEGFAULT during backup
overvenus Aug 11, 2020
6e90f1f
Merge branch 'master' into fix-checksum-segfault
ti-srebot Aug 11, 2020
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
13 changes: 8 additions & 5 deletions pkg/checksum/executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,9 @@ func buildIndexRequest(
}

func sendChecksumRequest(
ctx context.Context,
client kv.Client,
req *kv.Request,
ctx context.Context, client kv.Client, req *kv.Request, vars *kv.Variables,
) (resp *tipb.ChecksumResponse, err error) {
res, err := distsql.Checksum(ctx, client, req, nil)
res, err := distsql.Checksum(ctx, client, req, vars)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -273,7 +271,12 @@ func (exec *Executor) Execute(
) (*tipb.ChecksumResponse, error) {
checksumResp := &tipb.ChecksumResponse{}
for _, req := range exec.reqs {
resp, err := sendChecksumRequest(ctx, client, req)
// Pointer to SessionVars.Killed
// Killed is a flag to indicate that this query is killed.
//
// It is useful in TiDB, however, it's a place holder in BR.
killed := uint32(0)
resp, err := sendChecksumRequest(ctx, client, req, kv.NewVariables(&killed))
if err != nil {
return nil, err
}
Expand Down