diff --git a/core/src/main/scala/org/apache/spark/scheduler/TaskSchedulerImpl.scala b/core/src/main/scala/org/apache/spark/scheduler/TaskSchedulerImpl.scala index 510318afcb8df..2b0a11bfaf610 100644 --- a/core/src/main/scala/org/apache/spark/scheduler/TaskSchedulerImpl.scala +++ b/core/src/main/scala/org/apache/spark/scheduler/TaskSchedulerImpl.scala @@ -662,8 +662,9 @@ private[spark] class TaskSchedulerImpl( // in order to provision more executors to make them schedulable if (Utils.isDynamicAllocationEnabled(conf)) { if (!unschedulableTaskSetToExpiryTime.contains(taskSet)) { - logInfo(s"Notifying ExecutorAllocationManager to allocate more executors to" + - s" schedule the unschedulable task before aborting $taskSet.") + logInfo("Notifying ExecutorAllocationManager to allocate more executors to" + + " schedule the unschedulable task before aborting" + + " stage ${taskSet.stageId}.") dagScheduler.unschedulableTaskSetAdded(taskSet.taskSet.stageId, taskSet.taskSet.stageAttemptId) updateUnschedulableTaskSetTimeoutAndStartAbortTimer(taskSet, taskIndex) @@ -671,7 +672,7 @@ private[spark] class TaskSchedulerImpl( } else { // Abort Immediately logInfo("Cannot schedule any task because of complete blacklisting. No idle" + - s" executors can be found to kill. Aborting $taskSet.") + s" executors can be found to kill. Aborting stage ${taskSet.stageId}.") taskSet.abortSinceCompletelyBlacklisted(taskIndex) } } @@ -742,7 +743,7 @@ private[spark] class TaskSchedulerImpl( val timeout = conf.get(config.UNSCHEDULABLE_TASKSET_TIMEOUT) * 1000 unschedulableTaskSetToExpiryTime(taskSet) = clock.getTimeMillis() + timeout logInfo(s"Waiting for $timeout ms for completely " + - s"blacklisted task to be schedulable again before aborting $taskSet.") + s"blacklisted task to be schedulable again before aborting stage ${taskSet.stageId}.") abortTimer.schedule( createUnschedulableTaskSetAbortTimer(taskSet, taskIndex), timeout) } @@ -755,7 +756,7 @@ private[spark] class TaskSchedulerImpl( if (unschedulableTaskSetToExpiryTime.contains(taskSet) && unschedulableTaskSetToExpiryTime(taskSet) <= clock.getTimeMillis()) { logInfo("Cannot schedule any task because of complete blacklisting. " + - s"Wait time for scheduling expired. Aborting $taskSet.") + s"Wait time for scheduling expired. Aborting stage ${taskSet.stageId}.") taskSet.abortSinceCompletelyBlacklisted(taskIndex) } else { this.cancel()