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

disttask: correct the usage of context (#48343) #48369

Merged
merged 3 commits into from
Nov 8, 2023
Merged

disttask: correct the usage of context (#48343) #48369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69be911
disttask: correct the usage of context
tangenta Nov 7, 2023
2918b74
uncomment TestAddIndexDistPauseAndResume
tangenta Nov 7, 2023
7986506
chnage add index test timeout to long
tangenta Nov 7, 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
16 changes: 9 additions & 7 deletions pkg/disttask/framework/scheduler/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,12 @@ func (m *Manager) onRunnableTask(ctx context.Context, task *proto.Task) {
return
}
scheduler := factory(ctx, m.id, task, m.taskTable)
err := scheduler.Init(ctx)

taskCtx, taskCancel := context.WithCancelCause(ctx)
m.registerCancelFunc(task.ID, taskCancel)
defer taskCancel(nil)

err := scheduler.Init(taskCtx)
if err != nil {
m.logErrAndPersist(err, task.ID)
return
Expand Down Expand Up @@ -380,14 +385,11 @@ func (m *Manager) onRunnableTask(ctx context.Context, task *proto.Task) {
}
switch task.State {
case proto.TaskStateRunning:
runCtx, runCancel := context.WithCancelCause(ctx)
m.registerCancelFunc(task.ID, runCancel)
err = scheduler.Run(runCtx, task)
runCancel(nil)
err = scheduler.Run(taskCtx, task)
case proto.TaskStatePausing:
err = scheduler.Pause(ctx, task)
err = scheduler.Pause(taskCtx, task)
case proto.TaskStateReverting:
err = scheduler.Rollback(ctx, task)
err = scheduler.Rollback(taskCtx, task)
}
if err != nil {
logutil.Logger(m.logCtx).Error("failed to handle task", zap.Error(err))
Expand Down
12 changes: 6 additions & 6 deletions pkg/disttask/framework/scheduler/scheduler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,9 @@ func (*BaseScheduler) Init(_ context.Context) error {
func (s *BaseScheduler) Run(ctx context.Context, task *proto.Task) (err error) {
defer func() {
if r := recover(); r != nil {
logutil.Logger(ctx).Error("BaseScheduler panicked", zap.Any("recover", r), zap.Stack("stack"))
logutil.Logger(s.logCtx).Error("BaseScheduler panicked", zap.Any("recover", r), zap.Stack("stack"))
err4Panic := errors.Errorf("%v", r)
err1 := s.updateErrorToSubtask(ctx, task.ID, err4Panic)
err1 := s.updateErrorToSubtask(task.ID, err4Panic)
if err == nil {
err = err1
}
Expand All @@ -139,7 +139,7 @@ func (s *BaseScheduler) Run(ctx context.Context, task *proto.Task) (err error) {
if err == nil {
return nil
}
return s.updateErrorToSubtask(ctx, task.ID, err)
return s.updateErrorToSubtask(task.ID, err)
}

func (s *BaseScheduler) run(ctx context.Context, task *proto.Task) (resErr error) {
Expand Down Expand Up @@ -622,11 +622,11 @@ func (s *BaseScheduler) markSubTaskCanceledOrFailed(ctx context.Context, subtask
return false
}

func (s *BaseScheduler) updateErrorToSubtask(ctx context.Context, taskID int64, err error) error {
func (s *BaseScheduler) updateErrorToSubtask(taskID int64, err error) error {
logger := logutil.Logger(s.logCtx)
backoffer := backoff.NewExponential(dispatcher.RetrySQLInterval, 2, dispatcher.RetrySQLMaxInterval)
err1 := handle.RunWithRetry(ctx, dispatcher.RetrySQLTimes, backoffer, logger,
func(ctx context.Context) (bool, error) {
err1 := handle.RunWithRetry(s.logCtx, dispatcher.RetrySQLTimes, backoffer, logger,
func(_ context.Context) (bool, error) {
return true, s.taskTable.UpdateErrorToSubtask(s.id, taskID, err)
},
)
Expand Down
6 changes: 5 additions & 1 deletion tests/realtikvtest/addindextest1/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_test")

go_test(
name = "addindextest1_test",
timeout = "short",
timeout = "long",
srcs = [
"disttask_test.go",
"main_test.go",
Expand All @@ -11,6 +11,10 @@ go_test(
deps = [
"//pkg/config",
"//pkg/ddl",
"//pkg/ddl/util/callback",
"//pkg/disttask/framework/dispatcher",
"//pkg/disttask/framework/proto",
"//pkg/parser/model",
"//pkg/testkit",
"//tests/realtikvtest",
"@com_github_pingcap_failpoint//:failpoint",
Expand Down
145 changes: 74 additions & 71 deletions tests/realtikvtest/addindextest1/disttask_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ import (
"github.com/pingcap/failpoint"
"github.com/pingcap/tidb/pkg/config"
"github.com/pingcap/tidb/pkg/ddl"
"github.com/pingcap/tidb/pkg/ddl/util/callback"
"github.com/pingcap/tidb/pkg/disttask/framework/dispatcher"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/parser/model"
"github.com/pingcap/tidb/pkg/testkit"
"github.com/pingcap/tidb/tests/realtikvtest"
"github.com/stretchr/testify/require"
Expand Down Expand Up @@ -118,74 +122,73 @@ func TestAddIndexDistCancel(t *testing.T) {
tk.MustExec(`set global tidb_enable_dist_task=0;`)
}

// TODO: flaky test which can't find the root cause, will run it later.
// func TestAddIndexDistPauseAndResume(t *testing.T) {
// store, dom := realtikvtest.CreateMockStoreAndDomainAndSetup(t)
// if store.Name() != "TiKV" {
// t.Skip("TiKV store only")
// }

// tk := testkit.NewTestKit(t, store)
// tk1 := testkit.NewTestKit(t, store)
// tk.MustExec("drop database if exists test;")
// tk.MustExec("create database test;")
// tk.MustExec("use test;")

// tk.MustExec("create table t(a bigint auto_random primary key) partition by hash(a) partitions 8;")
// tk.MustExec("insert into t values (), (), (), (), (), ()")
// tk.MustExec("insert into t values (), (), (), (), (), ()")
// tk.MustExec("insert into t values (), (), (), (), (), ()")
// tk.MustExec("insert into t values (), (), (), (), (), ()")
// tk.MustExec("split table t between (3) and (8646911284551352360) regions 50;")

// ddl.MockDMLExecutionAddIndexSubTaskFinish = func() {
// row := tk1.MustQuery("select job_id from mysql.tidb_ddl_job").Rows()
// require.Equal(t, 1, len(row))
// jobID := row[0][0].(string)
// tk1.MustExec("admin pause ddl jobs " + jobID)
// <-ddl.TestSyncChan
// }

// dispatcher.MockDMLExecutionOnPausedState = func(task *proto.Task) {
// row := tk1.MustQuery("select job_id from mysql.tidb_ddl_job").Rows()
// require.Equal(t, 1, len(row))
// jobID := row[0][0].(string)
// tk1.MustExec("admin resume ddl jobs " + jobID)
// }

// ddl.MockDMLExecutionOnTaskFinished = func() {
// row := tk1.MustQuery("select job_id from mysql.tidb_ddl_job").Rows()
// require.Equal(t, 1, len(row))
// jobID := row[0][0].(string)
// tk1.MustExec("admin pause ddl jobs " + jobID)
// }

// require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/ddl/mockDMLExecutionAddIndexSubTaskFinish", "3*return(true)"))
// require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/disttask/framework/dispatcher/mockDMLExecutionOnPausedState", "return(true)"))
// require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/ddl/syncDDLTaskPause", "return()"))
// tk.MustExec(`set global tidb_enable_dist_task=1;`)
// tk.MustExec("alter table t add index idx1(a);")
// tk.MustExec("admin check table t;")
// require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/ddl/mockDMLExecutionAddIndexSubTaskFinish"))
// require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/disttask/framework/dispatcher/mockDMLExecutionOnPausedState"))

// // dist task succeed, job paused and resumed.
// var hook = &callback.TestDDLCallback{Do: dom}
// var resumeFunc = func(job *model.Job) {
// if job.IsPaused() {
// row := tk1.MustQuery("select job_id from mysql.tidb_ddl_job").Rows()
// require.Equal(t, 1, len(row))
// jobID := row[0][0].(string)
// tk1.MustExec("admin resume ddl jobs " + jobID)
// }
// }
// hook.OnJobUpdatedExported.Store(&resumeFunc)
// dom.DDL().SetHook(hook.Clone())
// require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/ddl/pauseAfterDistTaskFinished", "1*return(true)"))
// tk.MustExec("alter table t add index idx3(a);")
// tk.MustExec("admin check table t;")
// require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/ddl/pauseAfterDistTaskFinished"))
// require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/ddl/syncDDLTaskPause"))

// tk.MustExec(`set global tidb_enable_dist_task=0;`)
// }
func TestAddIndexDistPauseAndResume(t *testing.T) {
store, dom := realtikvtest.CreateMockStoreAndDomainAndSetup(t)
if store.Name() != "TiKV" {
t.Skip("TiKV store only")
}

tk := testkit.NewTestKit(t, store)
tk1 := testkit.NewTestKit(t, store)
tk.MustExec("drop database if exists test;")
tk.MustExec("create database test;")
tk.MustExec("use test;")

tk.MustExec("create table t(a bigint auto_random primary key) partition by hash(a) partitions 8;")
tk.MustExec("insert into t values (), (), (), (), (), ()")
tk.MustExec("insert into t values (), (), (), (), (), ()")
tk.MustExec("insert into t values (), (), (), (), (), ()")
tk.MustExec("insert into t values (), (), (), (), (), ()")
tk.MustExec("split table t between (3) and (8646911284551352360) regions 50;")

ddl.MockDMLExecutionAddIndexSubTaskFinish = func() {
row := tk1.MustQuery("select job_id from mysql.tidb_ddl_job").Rows()
require.Equal(t, 1, len(row))
jobID := row[0][0].(string)
tk1.MustExec("admin pause ddl jobs " + jobID)
<-ddl.TestSyncChan
}

dispatcher.MockDMLExecutionOnPausedState = func(task *proto.Task) {
row := tk1.MustQuery("select job_id from mysql.tidb_ddl_job").Rows()
require.Equal(t, 1, len(row))
jobID := row[0][0].(string)
tk1.MustExec("admin resume ddl jobs " + jobID)
}

ddl.MockDMLExecutionOnTaskFinished = func() {
row := tk1.MustQuery("select job_id from mysql.tidb_ddl_job").Rows()
require.Equal(t, 1, len(row))
jobID := row[0][0].(string)
tk1.MustExec("admin pause ddl jobs " + jobID)
}

require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/ddl/mockDMLExecutionAddIndexSubTaskFinish", "3*return(true)"))
require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/disttask/framework/dispatcher/mockDMLExecutionOnPausedState", "return(true)"))
require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/ddl/syncDDLTaskPause", "return()"))
tk.MustExec(`set global tidb_enable_dist_task=1;`)
tk.MustExec("alter table t add index idx1(a);")
tk.MustExec("admin check table t;")
require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/ddl/mockDMLExecutionAddIndexSubTaskFinish"))
require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/disttask/framework/dispatcher/mockDMLExecutionOnPausedState"))

// dist task succeed, job paused and resumed.
var hook = &callback.TestDDLCallback{Do: dom}
var resumeFunc = func(job *model.Job) {
if job.IsPaused() {
row := tk1.MustQuery("select job_id from mysql.tidb_ddl_job").Rows()
require.Equal(t, 1, len(row))
jobID := row[0][0].(string)
tk1.MustExec("admin resume ddl jobs " + jobID)
}
}
hook.OnJobUpdatedExported.Store(&resumeFunc)
dom.DDL().SetHook(hook.Clone())
require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/pkg/ddl/pauseAfterDistTaskFinished", "1*return(true)"))
tk.MustExec("alter table t add index idx3(a);")
tk.MustExec("admin check table t;")
require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/ddl/pauseAfterDistTaskFinished"))
require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/pkg/ddl/syncDDLTaskPause"))

tk.MustExec(`set global tidb_enable_dist_task=0;`)
}