Skip to content

[SPARK-15926] Improve readability of DAGScheduler stage creation methods #13677

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
kayousterhout wants to merge 8 commits into from
Closed

[SPARK-15926] Improve readability of DAGScheduler stage creation methods #13677

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4dca800
Renamed shuffleToMapStaqe in DAGScheduler.
kayousterhout Jun 15, 2016
1468b91
Cleaned up the code to create new shuffle map stages
kayousterhout Jun 10, 2016
a1a51ac
Various comment and naming cleanups
kayousterhout Jun 10, 2016
671d5de
More cleanup of shuffle map stage creation
kayousterhout Jun 11, 2016
43841a7
Some more naming and commenting improvements
kayousterhout Jun 13, 2016
49156f2
Moved createShuffleMapStage to be a non-nested function.
kayousterhout Jun 15, 2016
1b7a338
Renamed newResultStage to createResultStage and added commenting
kayousterhout Jun 15, 2016
22c6e42
Create parent stages before assigning stage ID
kayousterhout Jun 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
Prev Previous commit
Next Next commit
Renamed newResultStage to createResultStage and added commenting
  • Loading branch information
@kayousterhout
kayousterhout committed Jun 15, 2016
commit 1b7a3386fb631f1a41ea73d6bfdc9961ed8e4234
13 changes: 9 additions & 4 deletions core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,11 @@ class DAGScheduler(
case None =>
// Create stages for all missing ancestor shuffle dependencies.
getMissingAncestorShuffleDependencies(shuffleDep.rdd).foreach { dep =>
// Even though getMissingAncestorShuffleDependencies only returns shuffle dependencies
// that were not already in shuffleIdToMapStage, it's possible that by the time we
// get to a particular dependency in the foreach loop, it's been added to
// shuffleIdToMapStage by the stage creation process for an earlier dependency. See
// SPARK-13902 for more information.
if (!shuffleIdToMapStage.contains(dep.shuffleId)) {
createShuffleMapStage(dep, firstJobId)
}
Expand All @@ -315,8 +320,8 @@ class DAGScheduler(
val rdd = shuffleDep.rdd
val numTasks = rdd.partitions.length
val id = nextStageId.getAndIncrement()
val stage = new ShuffleMapStage(id, rdd, numTasks,
getOrCreateParentStages(rdd, jobId), jobId, rdd.creationSite, shuffleDep)
val stage = new ShuffleMapStage(
id, rdd, numTasks, getOrCreateParentStages(rdd, jobId), jobId, rdd.creationSite, shuffleDep)

stageIdToStage(id) = stage
shuffleIdToMapStage(shuffleDep.shuffleId) = stage
Expand Down Expand Up @@ -346,7 +351,7 @@ class DAGScheduler(
/**
* Create a ResultStage associated with the provided jobId.
*/
private def newResultStage(
private def createResultStage(
rdd: RDD[_],
func: (TaskContext, Iterator[_]) => _,
partitions: Array[Int],
Expand Down Expand Up @@ -830,7 +835,7 @@ class DAGScheduler(
try {
// New stage creation may throw an exception if, for example, jobs are run on a
// HadoopRDD whose underlying HDFS files have been deleted.
finalStage = newResultStage(finalRDD, func, partitions, jobId, callSite)
finalStage = createResultStage(finalRDD, func, partitions, jobId, callSite)
} catch {
case e: Exception =>
logWarning("Creating new stage failed due to exception - job: " + jobId, e)
Expand Down