From dbd5f73cf50a1eff45c09108fdc1610cc316412d Mon Sep 17 00:00:00 2001 From: Bryan Cutler Date: Wed, 1 Jul 2015 11:17:55 -0700 Subject: [PATCH] [SPARK-6980] Changed RpcUtils askRpcTimeout and lookupRpcTimeout scope to private[spark] and improved deprecation warning msg --- core/src/main/scala/org/apache/spark/util/RpcUtils.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/util/RpcUtils.scala b/core/src/main/scala/org/apache/spark/util/RpcUtils.scala index 7e15cad626f71..7578a3b1d85f2 100644 --- a/core/src/main/scala/org/apache/spark/util/RpcUtils.scala +++ b/core/src/main/scala/org/apache/spark/util/RpcUtils.scala @@ -47,21 +47,21 @@ object RpcUtils { } /** Returns the default Spark timeout to use for RPC ask operations. */ - def askRpcTimeout(conf: SparkConf): RpcTimeout = { + private[spark] def askRpcTimeout(conf: SparkConf): RpcTimeout = { RpcTimeout(conf, Seq("spark.rpc.askTimeout", "spark.network.timeout"), "120s") } - @deprecated("use askRpcTimeout instead", "1.5.0") + @deprecated("use askRpcTimeout instead, this method was not intended to be public", "1.5.0") def askTimeout(conf: SparkConf): FiniteDuration = { askRpcTimeout(conf).duration } /** Returns the default Spark timeout to use for RPC remote endpoint lookup. */ - def lookupRpcTimeout(conf: SparkConf): RpcTimeout = { + private[spark] def lookupRpcTimeout(conf: SparkConf): RpcTimeout = { RpcTimeout(conf, Seq("spark.rpc.lookupTimeout", "spark.network.timeout"), "120s") } - @deprecated("use lookupRpcTimeout instead", "1.5.0") + @deprecated("use lookupRpcTimeout instead, this method was not intended to be public", "1.5.0") def lookupTimeout(conf: SparkConf): FiniteDuration = { lookupRpcTimeout(conf).duration }