You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2015/12/21 23:09:07 UTC
spark git commit: [SPARK-12466] Fix harmless NPE in tests
Repository: spark
Updated Branches:
refs/heads/master a820ca19d -> d655d37dd
[SPARK-12466] Fix harmless NPE in tests
```
[info] ReplayListenerSuite:
[info] - Simple replay (58 milliseconds)
java.lang.NullPointerException
at org.apache.spark.deploy.master.Master$$anonfun$asyncRebuildSparkUI$1.applyOrElse(Master.scala:982)
at org.apache.spark.deploy.master.Master$$anonfun$asyncRebuildSparkUI$1.applyOrElse(Master.scala:980)
```
https://amplab.cs.berkeley.edu/jenkins/view/Spark-QA-Test/job/Spark-Master-SBT/4316/AMPLAB_JENKINS_BUILD_PROFILE=hadoop2.2,label=spark-test/consoleFull
This was introduced in #10284. It's harmless because the NPE is caused by a race that occurs mainly in `local-cluster` tests (but don't actually fail the tests).
Tested locally to verify that the NPE is gone.
Author: Andrew Or <an...@databricks.com>
Closes #10417 from andrewor14/fix-harmless-npe.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/d655d37d
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/d655d37d
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/d655d37d
Branch: refs/heads/master
Commit: d655d37ddf59d7fb6db529324ac8044d53b2622a
Parents: a820ca1
Author: Andrew Or <an...@databricks.com>
Authored: Mon Dec 21 14:09:04 2015 -0800
Committer: Andrew Or <an...@databricks.com>
Committed: Mon Dec 21 14:09:04 2015 -0800
----------------------------------------------------------------------
.../src/main/scala/org/apache/spark/deploy/master/Master.scala | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/d655d37d/core/src/main/scala/org/apache/spark/deploy/master/Master.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/deploy/master/Master.scala b/core/src/main/scala/org/apache/spark/deploy/master/Master.scala
index fc42bf0..5d97c63 100644
--- a/core/src/main/scala/org/apache/spark/deploy/master/Master.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/master/Master.scala
@@ -979,7 +979,11 @@ private[deploy] class Master(
futureUI.onSuccess { case Some(ui) =>
appIdToUI.put(app.id, ui)
- self.send(AttachCompletedRebuildUI(app.id))
+ // `self` can be null if we are already in the process of shutting down
+ // This happens frequently in tests where `local-cluster` is used
+ if (self != null) {
+ self.send(AttachCompletedRebuildUI(app.id))
+ }
// Application UI is successfully rebuilt, so link the Master UI to it
// NOTE - app.appUIUrlAtHistoryServer is volatile
app.appUIUrlAtHistoryServer = Some(ui.basePath)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org