diff options
author | Mark Hamstra <markhamstra@gmail.com> | 2013-12-25 12:16:21 -0800 |
---|---|---|
committer | Mark Hamstra <markhamstra@gmail.com> | 2013-12-25 23:10:02 -0800 |
commit | c529dceaffad0d0eb611ecb70fb5723dab43d0a1 (patch) | |
tree | ee713dedd6f366c640a835f1768a297ebe63d3a1 /core/src/main/scala | |
parent | 56094bcd8d3ba3442b88af01393d06fd7cd79bde (diff) | |
download | spark-c529dceaffad0d0eb611ecb70fb5723dab43d0a1.tar.gz spark-c529dceaffad0d0eb611ecb70fb5723dab43d0a1.tar.bz2 spark-c529dceaffad0d0eb611ecb70fb5723dab43d0a1.zip |
Avoid a lump of coal (NPE) in JobProgressListener's stocking.
Diffstat (limited to 'core/src/main/scala')
-rw-r--r-- | core/src/main/scala/org/apache/spark/ui/jobs/JobProgressListener.scala | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/JobProgressListener.scala b/core/src/main/scala/org/apache/spark/ui/jobs/JobProgressListener.scala index 07a42f0503..2e51dd5a99 100644 --- a/core/src/main/scala/org/apache/spark/ui/jobs/JobProgressListener.scala +++ b/core/src/main/scala/org/apache/spark/ui/jobs/JobProgressListener.scala @@ -146,12 +146,9 @@ private[spark] class JobProgressListener(val sc: SparkContext) extends SparkList // update duration y.taskTime += taskEnd.taskInfo.duration - taskEnd.taskMetrics.shuffleReadMetrics.foreach { shuffleRead => - y.shuffleRead += shuffleRead.remoteBytesRead - } - - taskEnd.taskMetrics.shuffleWriteMetrics.foreach { shuffleWrite => - y.shuffleWrite += shuffleWrite.shuffleBytesWritten + Option(taskEnd.taskMetrics).foreach { taskMetrics => + taskMetrics.shuffleReadMetrics.foreach { y.shuffleRead += _.remoteBytesRead } + taskMetrics.shuffleWriteMetrics.foreach { y.shuffleWrite += _.shuffleBytesWritten } } } case _ => {} |