Repository: spark Updated Branches: refs/heads/branch-2.0 06f592c39 -> 1d5c7f452
[SPARK-18843][CORE] Fix timeout in awaitResultInForkJoinSafely (branch 2.1, 2.0) ## What changes were proposed in this pull request? This PR fixes the timeout value in `awaitResultInForkJoinSafely` for 2.1 and 2.0. Master has been fixed by https://github.com/apache/spark/pull/16230. ## How was this patch tested? Jenkins Author: Shixiong Zhu <shixi...@databricks.com> Closes #16268 from zsxwing/SPARK-18843. (cherry picked from commit f672bfdf9689c0ab74226b11785ada50b72cd488) Signed-off-by: Shixiong Zhu <shixi...@databricks.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1d5c7f45 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1d5c7f45 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1d5c7f45 Branch: refs/heads/branch-2.0 Commit: 1d5c7f4528aed3f53334c387ff715a10ca11cd71 Parents: 06f592c Author: Shixiong Zhu <shixi...@databricks.com> Authored: Tue Dec 13 14:09:25 2016 -0800 Committer: Shixiong Zhu <shixi...@databricks.com> Committed: Tue Dec 13 14:09:36 2016 -0800 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/util/ThreadUtils.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/1d5c7f45/core/src/main/scala/org/apache/spark/util/ThreadUtils.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/util/ThreadUtils.scala b/core/src/main/scala/org/apache/spark/util/ThreadUtils.scala index d093e7b..a15c706 100644 --- a/core/src/main/scala/org/apache/spark/util/ThreadUtils.scala +++ b/core/src/main/scala/org/apache/spark/util/ThreadUtils.scala @@ -209,7 +209,7 @@ private[spark] object ThreadUtils { // `awaitPermission` is not actually used anywhere so it's safe to pass in null here. // See SPARK-13747. val awaitPermission = null.asInstanceOf[scala.concurrent.CanAwait] - awaitable.result(Duration.Inf)(awaitPermission) + awaitable.result(atMost)(awaitPermission) } catch { case NonFatal(t) => throw new SparkException("Exception thrown in awaitResult: ", t) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
