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/ddl: refine manager error handling #48095

Merged
merged 3 commits into from
Oct 31, 2023
+15 −6
Merged

disttask/ddl: refine manager error handling #48095

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
babff3a
refine, add more retryable error.
ywqzzy Oct 30, 2023
f82db95
refine log
ywqzzy Oct 30, 2023
f69e4af
Update pkg/disttask/framework/scheduler/scheduler.go
ywqzzy Oct 30, 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
2 changes: 2 additions & 0 deletions br/pkg/lightning/common/retry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ var retryableErrorIDs = map[errors.ErrorID]struct{}{
ErrKVReadIndexNotReady.ID(): {},
ErrKVIngestFailed.ID(): {},
ErrKVRaftProposalDropped.ID(): {},
// litBackendCtxMgr.Register may return the error.
ErrCreatePDClient.ID(): {},
// during checksum coprocessor will transform error into driver error in handleCopResponse using ToTiDBErr
// met ErrRegionUnavailable on free-tier import during checksum, others hasn't met yet
drivererr.ErrRegionUnavailable.ID(): {},
Expand Down
4 changes: 1 addition & 3 deletions pkg/ddl/index.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1088,9 +1088,7 @@ func runReorgJobAndHandleErr(w *worker, d *ddlCtx, t *meta.Meta, job *model.Job,
// TODO(tangenta): get duplicate column and match index.
err = convertToKeyExistsErr(err, allIndexInfos[0], tbl.Meta())
}
if !errorIsRetryable(err, job) ||
// TODO: Remove this check make it can be retry. Related test is TestModifyColumnReorgInfo.
job.ReorgMeta.IsDistReorg {
if !errorIsRetryable(err, job) {
logutil.BgLogger().Warn("run add index job failed, convert job to rollback", zap.String("category", "ddl"), zap.String("job", job.String()), zap.Error(err))
ver, err = convertAddIdxJob2RollbackJob(d, t, job, tbl.Meta(), allIndexInfos, err)
if err1 := rh.RemoveDDLReorgHandle(job, reorgInfo.elements); err1 != nil {
Expand Down
8 changes: 7 additions & 1 deletion pkg/disttask/framework/scheduler/manager.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/errors"
"github.com/pingcap/failpoint"
"github.com/pingcap/tidb/br/pkg/lightning/common"
"github.com/pingcap/tidb/pkg/config"
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
"github.com/pingcap/tidb/pkg/domain/infosync"
Expand Down Expand Up @@ -416,13 +417,18 @@ func (m *Manager) removeHandlingTask(id int64) {
}

func (m *Manager) logErr(err error) {
logutil.Logger(m.logCtx).Error("task manager error", zap.Error(err), zap.Stack("stack"))
logutil.Logger(m.logCtx).Error("task manager met error", zap.Error(err), zap.Stack("stack"))
}

func (m *Manager) logErrAndPersist(err error, taskID int64) {
m.logErr(err)
// TODO: use interface if each business to retry
if common.IsRetryableError(err) || isRetryableError(err) {
return
}
err1 := m.taskTable.UpdateErrorToSubtask(m.id, taskID, err)
if err1 != nil {
logutil.Logger(m.logCtx).Error("update to subtask failed", zap.Error(err1), zap.Stack("stack"))
}
logutil.Logger(m.logCtx).Error("update error to subtask", zap.Int64("task-id", taskID), zap.Error(err1), zap.Stack("stack"))
}
7 changes: 5 additions & 2 deletions pkg/disttask/framework/scheduler/scheduler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,13 +474,13 @@ func (s *BaseScheduler) onError(err error) {
return
}
err = errors.Trace(err)
logutil.Logger(s.logCtx).Error("onError", zap.Error(err))
logutil.Logger(s.logCtx).Error("onError", zap.Error(err), zap.Stack("stack"))
s.mu.Lock()
defer s.mu.Unlock()

if s.mu.err == nil {
s.mu.err = err
logutil.Logger(s.logCtx).Error("scheduler error", zap.Error(err))
logutil.Logger(s.logCtx).Error("scheduler met first error", zap.Error(err))
}

if s.mu.runtimeCancel != nil {
Expand Down Expand Up @@ -620,5 +620,8 @@ func (s *BaseScheduler) updateErrorToSubtask(ctx context.Context, taskID int64,
return true, s.taskTable.UpdateErrorToSubtask(s.id, taskID, err)
},
)
if err1 == nil {
logger.Warn("update error to subtask success", zap.Error(err))
}
return err1
}
Loading