diff options
| author | Matei Zaharia <matei.zaharia@gmail.com> | 2013-09-05 20:21:53 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei.zaharia@gmail.com> | 2013-09-05 20:21:53 -0700 |
| commit | 699c331f2f1ea57adf43f9bf5c56f8400b45acb9 (patch) | |
| tree | 3d34c09ef6c6faf74cf0e9e18ef9a8ed1ef4424d /core | |
| parent | 5c7494d7c1b7301138fb3dc155a1b0c961126ec6 (diff) | |
| parent | 7c15e3c5de1282c070560e63203790b71e1c6f0d (diff) | |
| download | spark-699c331f2f1ea57adf43f9bf5c56f8400b45acb9.tar.gz spark-699c331f2f1ea57adf43f9bf5c56f8400b45acb9.tar.bz2 spark-699c331f2f1ea57adf43f9bf5c56f8400b45acb9.zip | |
Merge pull request #891 from xiajunluan/SPARK-864
[SPARK-864]DAGScheduler Exception if we delete Worker and StandaloneExecutorBackend then add Worker
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala b/core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala index 92add5b073..cfcabca0b7 100644 --- a/core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala +++ b/core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala @@ -531,9 +531,16 @@ class DAGScheduler( tasks += new ResultTask(stage.id, stage.rdd, job.func, partition, locs, id) } } + + val properties = if (idToActiveJob.contains(stage.jobId)) { + idToActiveJob(stage.jobId).properties + } else { + //this stage will be assigned to "default" pool + null + } + // must be run listener before possible NotSerializableException // should be "StageSubmitted" first and then "JobEnded" - val properties = idToActiveJob(stage.jobId).properties listenerBus.post(SparkListenerStageSubmitted(stage, tasks.size, properties)) if (tasks.size > 0) { |