Skip to content

[SPARK-16709][CORE] Kill the running task if stage failed #14557

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
shenh062326 wants to merge 4 commits into from
Closed

[SPARK-16709][CORE] Kill the running task if stage failed #14557

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a1ea2f
Kill the running task if stage failed.
shenh062326 Aug 9, 2016
9263678
Fix test failed.
shenh062326 Aug 9, 2016
9ea08e8
Move killTasks from SparkContext.scala to TaskSetManager.scala
shenh062326 Aug 9, 2016
fbe31eb
Remove return and add a space.
shenh062326 Aug 15, 2016
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
10 changes: 9 additions & 1 deletion core/src/main/scala/org/apache/spark/SparkContext.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import java.util.concurrent.atomic.{AtomicBoolean, AtomicInteger, AtomicReferenc
import scala.collection.JavaConverters._
import scala.collection.Map
import scala.collection.generic.Growable
import scala.collection.mutable.HashMap
import scala.collection.mutable.{HashMap, HashSet}
import scala.language.implicitConversions
import scala.reflect.{classTag, ClassTag}
import scala.util.control.NonFatal
Expand Down Expand Up @@ -1564,6 +1564,14 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli
}
}

def killTasks(tasks: HashSet[Long], taskInfo: HashMap[Long, TaskInfo]): Boolean = {
Copy link
Contributor

@jerryshao jerryshao Aug 9, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is not suitable to add a public method here in SparkContext, SparkContext is a public entry point, any method adds to here should be considered carefully. In your case looks like only Spark internally will use this method, why not directly change the TaskSetManager?

Copy link
Contributor Author

@shenh062326 shenh062326 Aug 9, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Jerryshao, Thanks for your prompt. I will move the method to TaskSetManager.

tasks.foreach { task =>
val executorId = taskInfo(task).executorId
schedulerBackend.killTask(task, executorId, true)
}
true
}

/** The version of Spark on which this application is running. */
def version: String = SPARK_VERSION

Expand Down
5 changes: 5 additions & 0 deletions core/src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -798,6 +798,11 @@ private[spark] class TaskSetManager(
}
}
maybeFinishTaskSet()

// kill running task if stage failed
if(reason.isInstanceOf[FetchFailed]) {
Copy link
Contributor

@jaceklaskowski jaceklaskowski Aug 13, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A space between if and (.

sched.sc.killTasks(runningTasksSet, taskInfos)
}
}

def abort(message: String, exception: Option[Throwable] = None): Unit = sched.synchronized {
Expand Down