diff options
| author | Andrew Or <andrew@databricks.com> | 2015-06-08 18:09:21 -0700 |
|---|---|---|
| committer | Andrew Or <andrew@databricks.com> | 2015-06-08 18:09:21 -0700 |
| commit | f3eec92ce7e13cc461d2f0404f26730259210f12 (patch) | |
| tree | 1f9f61e8270ee2e15ef5309cd75dc93a0de8e86a /core | |
| parent | 51853891686f353dc9decc31066b0de01ed8b49e (diff) | |
| download | spark-f3eec92ce7e13cc461d2f0404f26730259210f12.tar.gz spark-f3eec92ce7e13cc461d2f0404f26730259210f12.tar.bz2 spark-f3eec92ce7e13cc461d2f0404f26730259210f12.zip | |
[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 <andrew@databricks.com>
Closes #6711 from andrewor14/fix-spark-shell and squashes the following commits:
bf62ecc [Andrew Or] Prevent NPE in spark-shell
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/ui/jobs/JobProgressListener.scala | 2 |
1 files changed, 1 insertions, 1 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 730f9806e5..0c854f0489 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) { |