spark git commit: [SPARK-12466] Fix harmless NPE in tests

[andrewor14]

Repository: spark
Updated Branches:
  refs/heads/branch-1.6 c754a0879 -> ca3998512


[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 

Closes #10417 from andrewor14/fix-harmless-npe.

(cherry picked from commit d655d37ddf59d7fb6db529324ac8044d53b2622a)
Signed-off-by: Andrew Or 


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/ca399851
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ca399851
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ca399851

Branch: refs/heads/branch-1.6
Commit: ca3998512dd7801379c96c9399d3d053ab7472cd
Parents: c754a08
Author: Andrew Or 
Authored: Mon Dec 21 14:09:04 2015 -0800
Committer: Andrew Or 
Committed: Mon Dec 21 14:09:11 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/ca399851/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-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

spark git commit: [SPARK-12466] Fix harmless NPE in tests

[andrewor14]

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 

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 
Authored: Mon Dec 21 14:09:04 2015 -0800
Committer: Andrew Or 
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-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org