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/06/09 03:09:25 UTC
spark git commit: [SPARK-8162] [HOTFIX] Fix NPE in spark-shell
Repository: spark
Updated Branches:
refs/heads/master 518538916 -> f3eec92ce
[SPARK-8162] [HOTFIX] Fix NPE in spark-shell
This was caused by this commit: f271347
This patch does not attempt to fix the root cause of why the `VisibleForTesting` annotation causes a NPE in the shell. We should find a way to fix that separately.
Author: Andrew Or <an...@databricks.com>
Closes #6711 from andrewor14/fix-spark-shell and squashes the following commits:
bf62ecc [Andrew Or] Prevent NPE in spark-shell
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/f3eec92c
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/f3eec92c
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/f3eec92c
Branch: refs/heads/master
Commit: f3eec92ce7e13cc461d2f0404f26730259210f12
Parents: 5185389
Author: Andrew Or <an...@databricks.com>
Authored: Mon Jun 8 18:09:21 2015 -0700
Committer: Andrew Or <an...@databricks.com>
Committed: Mon Jun 8 18:09:21 2015 -0700
----------------------------------------------------------------------
.../main/scala/org/apache/spark/ui/jobs/JobProgressListener.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/f3eec92c/core/src/main/scala/org/apache/spark/ui/jobs/JobProgressListener.scala
----------------------------------------------------------------------
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 730f980..0c854f0 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
@@ -539,11 +539,11 @@ class JobProgressListener(conf: SparkConf) extends SparkListener with Logging {
/**
* For testing only. Wait until at least `numExecutors` executors are up, or throw
* `TimeoutException` if the waiting time elapsed before `numExecutors` executors up.
+ * Exposed for testing.
*
* @param numExecutors the number of executors to wait at least
* @param timeout time to wait in milliseconds
*/
- @VisibleForTesting
private[spark] def waitUntilExecutorsUp(numExecutors: Int, timeout: Long): Unit = {
val finishTime = System.currentTimeMillis() + timeout
while (System.currentTimeMillis() < finishTime) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org