Skip to content

Commit 4e89c75

Browse files
committed
[SPARK-6980] Missed one usage of deprecated RpcUtils.askTimeout in YarnSchedulerBackend although it is not being used, and fixed SparkConfSuite UT to not use deprecated RpcUtils functions
1 parent 6a1c50d commit 4e89c75

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

core/src/main/scala/org/apache/spark/scheduler/cluster/YarnSchedulerBackend.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ private[spark] abstract class YarnSchedulerBackend(
4646
private val yarnSchedulerEndpoint = rpcEnv.setupEndpoint(
4747
YarnSchedulerBackend.ENDPOINT_NAME, new YarnSchedulerEndpoint(rpcEnv))
4848

49-
private implicit val askTimeout = RpcUtils.askTimeout(sc.conf)
49+
private implicit val askTimeout = RpcUtils.askRpcTimeout(sc.conf)
5050

5151
/**
5252
* Request executors from the ApplicationMaster by specifying the total number desired.

core/src/test/scala/org/apache/spark/SparkConfSuite.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,10 +260,10 @@ class SparkConfSuite extends SparkFunSuite with LocalSparkContext with ResetSyst
260260
assert(RpcUtils.retryWaitMs(conf) === 2L)
261261

262262
conf.set("spark.akka.askTimeout", "3")
263-
assert(RpcUtils.askTimeout(conf) === (3 seconds))
263+
assert(RpcUtils.askRpcTimeout(conf).duration === (3 seconds))
264264

265265
conf.set("spark.akka.lookupTimeout", "4")
266-
assert(RpcUtils.lookupTimeout(conf) === (4 seconds))
266+
assert(RpcUtils.lookupRpcTimeout(conf).duration === (4 seconds))
267267
}
268268
}
269269

0 commit comments

Comments
 (0)