Skip to content

[SPARK-20713][Spark Core] Convert CommitDenied to TaskKilled. #18819

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

Closed
nlyu wants to merge 3 commits into from
Closed

[SPARK-20713][Spark Core] Convert CommitDenied to TaskKilled. #18819

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
51edebf
change to taskcommitdenied, change updatestatus to .KILLED, change nu…
Aug 2, 2017
499f1e0
fix bugs add task killed reason
Aug 2, 2017
f975922
add commitDenied case clause
Aug 2, 2017
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
4 changes: 2 additions & 2 deletions core/src/main/scala/org/apache/spark/executor/CommitDeniedException.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

package org.apache.spark.executor

import org.apache.spark.{TaskCommitDenied, TaskFailedReason}
import org.apache.spark.TaskCommitDenied

/**
* Exception thrown when a task attempts to commit output to HDFS but is denied by the driver.
Expand All @@ -29,5 +29,5 @@ private[spark] class CommitDeniedException(
attemptNumber: Int)
extends Exception(msg) {

def toTaskFailedReason: TaskFailedReason = TaskCommitDenied(jobID, splitID, attemptNumber)
def toTaskCommitDeniedReason: TaskCommitDenied = TaskCommitDenied(jobID, splitID, attemptNumber)
}
4 changes: 2 additions & 2 deletions core/src/main/scala/org/apache/spark/executor/Executor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,9 +463,9 @@ private[spark] class Executor(
taskId, TaskState.KILLED, ser.serialize(TaskKilled(killReason)))

case CausedBy(cDE: CommitDeniedException) =>
val reason = cDE.toTaskFailedReason
val reason = cDE.toTaskCommitDeniedReason
setTaskFinishedAndClearInterruptStatus()
execBackend.statusUpdate(taskId, TaskState.FAILED, ser.serialize(reason))
execBackend.statusUpdate(taskId, TaskState.KILLED, ser.serialize(reason))

case t: Throwable =>
// Attempt to exit cleanly by informing the driver of our failure.
Expand Down
13 changes: 13 additions & 0 deletions core/src/main/scala/org/apache/spark/ui/jobs/JobProgressListener.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,10 @@ class JobProgressListener(conf: SparkConf) extends SparkListener with Logging {
case kill: TaskKilled =>
execSummary.reasonToNumKilled = execSummary.reasonToNumKilled.updated(
kill.reason, execSummary.reasonToNumKilled.getOrElse(kill.reason, 0) + 1)
case commitDenied: TaskCommitDenied =>
execSummary.reasonToNumKilled = execSummary.reasonToNumKilled.updated(
commitDenied.toErrorString, execSummary.reasonToNumKilled.getOrElse(
commitDenied.toErrorString, 0) + 1)
case _ =>
execSummary.failedTasks += 1
}
Expand All @@ -390,6 +394,11 @@ class JobProgressListener(conf: SparkConf) extends SparkListener with Logging {
stageData.reasonToNumKilled = stageData.reasonToNumKilled.updated(
kill.reason, stageData.reasonToNumKilled.getOrElse(kill.reason, 0) + 1)
Some(kill.toErrorString)
case commitDenied: TaskCommitDenied =>
stageData.reasonToNumKilled = stageData.reasonToNumKilled.updated(
commitDenied.toErrorString, stageData.reasonToNumKilled.getOrElse(
commitDenied.toErrorString, 0) + 1)
Some(commitDenied.toErrorString)
case e: ExceptionFailure => // Handle ExceptionFailure because we might have accumUpdates
stageData.numFailedTasks += 1
Some(e.toErrorString)
Expand Down Expand Up @@ -428,6 +437,10 @@ class JobProgressListener(conf: SparkConf) extends SparkListener with Logging {
case kill: TaskKilled =>
jobData.reasonToNumKilled = jobData.reasonToNumKilled.updated(
kill.reason, jobData.reasonToNumKilled.getOrElse(kill.reason, 0) + 1)
case commitDenied: TaskCommitDenied =>
jobData.reasonToNumKilled = jobData.reasonToNumKilled.updated(
commitDenied.toErrorString, jobData.reasonToNumKilled.getOrElse(
commitDenied.toErrorString, 0) + 1)
case _ =>
jobData.numFailedTasks += 1
}
Expand Down