Skip to content

pkg/dxf: avoid misleading error log on context cancel (#67612) #67674

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

Merged
ti-chi-bot merged 2 commits into from
Apr 10, 2026
+7 −1
Merged

pkg/dxf: avoid misleading error log on context cancel (#67612) #67674

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ade13f7
This is an automated cherry-pick of #67612
D3Hunter Apr 9, 2026
a194b3c
Merge remote-tracking branch 'upstream/release-nextgen-20251011' into…
D3Hunter Apr 10, 2026
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
8 changes: 7 additions & 1 deletion pkg/disttask/framework/taskexecutor/task_executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,13 @@ func (e *BaseTaskExecutor) Run() {
// task executor keeps running its subtasks even though some subtask
// might have failed, we rely on scheduler to detect the error, and
// notify task executor or manager to cancel.
e.sampleLogger.Error("run subtask failed", zap.Error(err))
if llog.IsContextCanceledError(err) {
// Context canceled is expected when scheduler/manager cancels executor,
// so log as info instead of a subtask failure.
e.sampleLogger.Info("subtask run canceled by context", llog.ShortError(err))
} else {
e.sampleLogger.Error("run subtask failed", zap.Error(err))
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
} else {
// if we run a subtask successfully, we will try to run next subtask
// immediately for once.
Expand Down