Repository: spark Updated Branches: refs/heads/branch-2.1 292a37f24 -> f672bfdf9
[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 <[email protected]> Closes #16268 from zsxwing/SPARK-18843. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/f672bfdf Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/f672bfdf Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/f672bfdf Branch: refs/heads/branch-2.1 Commit: f672bfdf9689c0ab74226b11785ada50b72cd488 Parents: 292a37f Author: Shixiong Zhu <[email protected]> Authored: Tue Dec 13 14:09:25 2016 -0800 Committer: Shixiong Zhu <[email protected]> Committed: Tue Dec 13 14:09:25 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/f672bfdf/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 60a6e82..2a21c6a 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: [email protected] For additional commands, e-mail: [email protected]
