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

disttask: refine manager retry #51071

Merged
merged 4 commits into from
Feb 26, 2024
Merged

disttask: refine manager retry #51071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5b3ac0b
refine retry
ywqzzy Feb 8, 2024
7ec44e8
address comments
ywqzzy Feb 23, 2024
c9d2c47
fix
ywqzzy Feb 23, 2024
d943d2c
fix build
ywqzzy Feb 23, 2024
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
1 change: 1 addition & 0 deletions pkg/disttask/framework/taskexecutor/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ go_test(
"//pkg/disttask/framework/mock",
"//pkg/disttask/framework/mock/execute",
"//pkg/disttask/framework/proto",
"//pkg/disttask/framework/scheduler",
"//pkg/disttask/framework/storage",
"//pkg/disttask/framework/testutil",
"//pkg/kv",
Expand Down
75 changes: 31 additions & 44 deletions pkg/disttask/framework/taskexecutor/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,13 @@ import (
"github.com/pingcap/errors"
"github.com/pingcap/log"
"github.com/pingcap/tidb/pkg/config"
"github.com/pingcap/tidb/pkg/disttask/framework/handle"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/scheduler"
"github.com/pingcap/tidb/pkg/disttask/framework/storage"
"github.com/pingcap/tidb/pkg/metrics"
tidbutil "github.com/pingcap/tidb/pkg/util"
"github.com/pingcap/tidb/pkg/util/backoff"
"github.com/pingcap/tidb/pkg/util/cpu"
"github.com/pingcap/tidb/pkg/util/intest"
"github.com/pingcap/tidb/pkg/util/memory"
Expand All @@ -44,8 +47,6 @@ var (
MaxCheckInterval = 2 * time.Second
maxChecksWhenNoSubtask = 7
recoverMetaInterval = 90 * time.Second
retrySQLTimes = 30
retrySQLInterval = 500 * time.Millisecond
unfinishedSubtaskStates = []proto.SubtaskState{
proto.SubtaskStatePending,
proto.SubtaskStateRunning,
Expand Down Expand Up @@ -108,44 +109,16 @@ func NewManager(ctx context.Context, id string, taskTable TaskTable) (*Manager,
// InitMeta initializes the meta of the Manager.
// not a must-success step before start manager,
// manager will try to recover meta periodically.
func (m *Manager) InitMeta() (err error) {
for i := 0; i < retrySQLTimes; i++ {
err = m.taskTable.InitMeta(m.ctx, m.id, config.GetGlobalConfig().Instance.TiDBServiceScope)
if err == nil {
break
}
if err1 := m.ctx.Err(); err1 != nil {
return err1
}
if i%10 == 0 {
m.logger.Warn("start manager failed",
zap.String("scope", config.GetGlobalConfig().Instance.TiDBServiceScope),
zap.Int("retry times", i),
zap.Error(err))
}
time.Sleep(retrySQLInterval)
}
return err
func (m *Manager) InitMeta() error {
return m.runWithRetry(func() error {
return m.taskTable.InitMeta(m.ctx, m.id, config.GetGlobalConfig().Instance.TiDBServiceScope)
}, "init meta failed")
}

func (m *Manager) recoverMeta() (err error) {
for i := 0; i < retrySQLTimes; i++ {
err = m.taskTable.RecoverMeta(m.ctx, m.id, config.GetGlobalConfig().Instance.TiDBServiceScope)
if err == nil {
break
}
if err1 := m.ctx.Err(); err1 != nil {
return err1
}
if i%10 == 0 {
m.logger.Warn("recover meta failed",
zap.String("scope", config.GetGlobalConfig().Instance.TiDBServiceScope),
zap.Int("retry times", i),
zap.Error(err))
}
time.Sleep(retrySQLInterval)
}
return err
func (m *Manager) recoverMeta() error {
return m.runWithRetry(func() error {
return m.taskTable.RecoverMeta(m.ctx, m.id, config.GetGlobalConfig().Instance.TiDBServiceScope)
}, "recover meta failed")
}

// Start starts the Manager.
Expand Down Expand Up @@ -311,13 +284,13 @@ func (m *Manager) startTaskExecutor(task *proto.Task) {
factory := GetTaskExecutorFactory(task.Type)
if factory == nil {
err := errors.Errorf("task type %s not found", task.Type)
m.logErrAndPersist(err, task.ID, nil)
m.failSubtask(err, task.ID, nil)
return
}
executor := factory(m.ctx, m.id, task, m.taskTable)
err := executor.Init(m.ctx)
if err != nil {
m.logErrAndPersist(err, task.ID, executor)
m.failSubtask(err, task.ID, executor)
return
}
m.addTaskExecutor(executor)
Expand Down Expand Up @@ -367,17 +340,31 @@ func (m *Manager) logErr(err error) {
m.logger.Error("task manager met error", zap.Error(err), zap.Stack("stack"))
}

func (m *Manager) logErrAndPersist(err error, taskID int64, taskExecutor TaskExecutor) {
func (m *Manager) failSubtask(err error, taskID int64, taskExecutor TaskExecutor) {
m.logErr(err)
// TODO we want to define err of taskexecutor.Init as fatal, but add-index have
// some code in Init that need retry, remove it after it's decoupled.
if taskExecutor != nil && taskExecutor.IsRetryableError(err) {
m.logger.Error("met retryable err", zap.Error(err), zap.Stack("stack"))
return
}
err1 := m.taskTable.FailSubtask(m.ctx, m.id, taskID, err)
err1 := m.runWithRetry(func() error {
return m.taskTable.FailSubtask(m.ctx, m.id, taskID, err)
}, "update to subtask failed")
if err1 == nil {
m.logger.Error("update error to subtask success", zap.Int64("task-id", taskID), zap.Error(err1), zap.Stack("stack"))
}
}

func (m *Manager) runWithRetry(fn func() error, msg string) error {
backoffer := backoff.NewExponential(scheduler.RetrySQLInterval, 2, scheduler.RetrySQLMaxInterval)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we not put this to RunWithRetry? Then we can use it directly.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe too many params?

err1 := handle.RunWithRetry(m.ctx, scheduler.RetrySQLTimes, backoffer, m.logger,
func(_ context.Context) (bool, error) {
return true, fn()
},
)
if err1 != nil {
m.logger.Error("update to subtask failed", zap.Error(err1), zap.Stack("stack"))
m.logger.Warn(msg, zap.Error(err1))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems that the error log is printed in RunWithRetry, so could we remove this log?

Copy link
Contributor Author

@ywqzzy ywqzzy Feb 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer to add some log to indicate where it happens

}
m.logger.Error("update error to subtask", zap.Int64("task-id", taskID), zap.Error(err1), zap.Stack("stack"))
return err1
}
7 changes: 4 additions & 3 deletions pkg/disttask/framework/taskexecutor/manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (

"github.com/pingcap/tidb/pkg/disttask/framework/mock"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/disttask/framework/scheduler"
"github.com/pingcap/tidb/pkg/disttask/framework/storage"
"github.com/pingcap/tidb/pkg/util/logutil"
"github.com/pingcap/tidb/pkg/util/memory"
Expand Down Expand Up @@ -447,11 +448,11 @@ func TestManagerInitMeta(t *testing.T) {
require.NoError(t, m.InitMeta())
require.True(t, ctrl.Satisfied())

bak := retrySQLTimes
bak := scheduler.RetrySQLTimes
t.Cleanup(func() {
retrySQLTimes = bak
scheduler.RetrySQLTimes = bak
})
retrySQLTimes = 1
scheduler.RetrySQLTimes = 1
mockTaskTable.EXPECT().InitMeta(gomock.Any(), gomock.Any(), gomock.Any()).Return(errors.New("mock err"))
require.ErrorContains(t, m.InitMeta(), "mock err")
require.True(t, ctrl.Satisfied())
Expand Down