Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions pkg/owner/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -641,9 +641,7 @@ func AcquireDistributedLock(
}
return false, nil
})
failpoint.Inject("mockAcquireDistLockFailed", func() {
err = errors.Errorf("requested lease not found")
})
failpoint.InjectCall("mockAcquireDistLockFailed", &err)
if err != nil {
err1 := se.Close()
if err1 != nil {
Expand Down
1 change: 1 addition & 0 deletions pkg/util/dbterror/ddl_terror.go
Original file line number Diff line number Diff line change
Expand Up @@ -543,4 +543,5 @@ var ReorgRetryableErrCodes = map[uint16]struct{}{
var ReorgRetryableErrMsgs = []string{
"context deadline exceeded",
"requested lease not found",
"mvcc: required revision has been compacted",
}
22 changes: 18 additions & 4 deletions tests/realtikvtest/addindextest1/disttask_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -417,10 +417,24 @@ func TestAddIndexDistLockAcquireFailed(t *testing.T) {
t.Cleanup(func() {
tk.MustExec("set global tidb_enable_dist_task = off;")
})
tk.MustExec("create table t (a int, b int);")
tk.MustExec("insert into t values (1, 1);")
testfailpoint.Enable(t, "github.com/pingcap/tidb/pkg/owner/mockAcquireDistLockFailed", "1*return(true)")
tk.MustExec("alter table t add index idx(b);")
retryableErrs := []string{
"requested lease not found",
"mvcc: required revision has been compacted",
}
for _, errStr := range retryableErrs {
t.Run(errStr, func(t *testing.T) {
tk.MustExec("drop table if exists t;")
tk.MustExec("create table t (a int, b int);")
tk.MustExec("insert into t values (1, 1);")
var once sync.Once
testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/owner/mockAcquireDistLockFailed", func(errP *error) {
once.Do(func() {
*errP = errors.New(errStr)
})
})
tk.MustExec("alter table t add index idx(b);")
})
}
}

func TestAddIndexScheduleAway(t *testing.T) {
Expand Down