Skip to content

Commit f672bfd

Browse files
committed
[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 #16230. ## How was this patch tested? Jenkins Author: Shixiong Zhu <shixiong@databricks.com> Closes #16268 from zsxwing/SPARK-18843.
1 parent 292a37f commit f672bfd

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

core/src/main/scala/org/apache/spark/util/ThreadUtils.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ private[spark] object ThreadUtils {
209209
// `awaitPermission` is not actually used anywhere so it's safe to pass in null here.
210210
// See SPARK-13747.
211211
val awaitPermission = null.asInstanceOf[scala.concurrent.CanAwait]
212-
awaitable.result(Duration.Inf)(awaitPermission)
212+
awaitable.result(atMost)(awaitPermission)
213213
} catch {
214214
case NonFatal(t) =>
215215
throw new SparkException("Exception thrown in awaitResult: ", t)

0 commit comments

Comments
 (0)