Skip to content

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

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
lycplus wants to merge 5 commits into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3467d5d
Convert CommitDenied to TaskKilled.
lycplus May 23, 2017
f886077
Convert the CommitDeniedException in the right place.
lycplus May 26, 2017
8b47112
Remove unused imports.
lycplus May 26, 2017
ff93ade
Update toTaskFailedReason to TaskCommitDeniedReason.
lycplus May 27, 2017
99b2f8c
Let TaskCommitDenied extends TaskKilled.
lycplus Jun 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
5 changes: 2 additions & 3 deletions core/src/main/scala/org/apache/spark/TaskEndReason.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,8 @@ case class TaskKilled(reason: String) extends TaskFailedReason {
case class TaskCommitDenied(
jobID: Int,
partitionID: Int,
attemptNumber: Int) extends TaskFailedReason {
override def toErrorString: String = s"TaskCommitDenied (Driver denied task commit)" +
s" for job: $jobID, partition: $partitionID, attemptNumber: $attemptNumber"
attemptNumber: Int) extends TaskKilled(reason = s"TaskCommitDenied (Driver denied task commit)"
+ s" for job: $jobID, partition: $partitionID, attemptNumber: $attemptNumber") {
/**
* If a task failed because its attempt to commit was denied, do not count this failure
* towards failing the stage. This is intended to prevent spurious stage failures in cases
Expand Down
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.{TaskKilled, 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 toTaskKilled: TaskKilled = 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 @@ -457,9 +457,9 @@ private[spark] class Executor(
taskId, TaskState.KILLED, ser.serialize(TaskKilled(killReason)))

case CausedBy(cDE: CommitDeniedException) =>
val reason = cDE.toTaskFailedReason
val reason = cDE.toTaskKilled
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