This is an automated cherry-pick of pingcap#67612

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

Author: D3Hunter

pkg/disttask/framework/taskexecutor/task_executor.go

@@ -381,7 +381,17 @@ 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.
+<<<<<<< HEAD:pkg/disttask/framework/taskexecutor/task_executor.go
 			e.logger.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))
+			}
+>>>>>>> 79685135013 (pkg/dxf: avoid misleading error log on context cancel (#67612)):pkg/dxf/framework/taskexecutor/task_executor.go
 		} else {
 			// if we run a subtask successfully, we will try to run next subtask
 			// immediately for once.