remove vars, update docs

apache · Mar 5, 2019 · a316760 · a316760
1 parent ad17a02
commit a316760
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/Config.scala b/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/Config.scala
@@ -100,13 +100,13 @@ private[spark] object Config extends Logging {
 
   val DRIVER_CLIENT_REQUEST_TIMEOUT =
     ConfigBuilder("spark.kubernetes.driver.requestTimeout")
-      .doc("request timeout to be used in milliseconds for requesting executors")
+      .doc("request timeout to be used in milliseconds for driver to request executors")
       .intConf
       .createWithDefault(10000)
 
   val DRIVER_CLIENT_CONNECTION_TIMEOUT =
     ConfigBuilder("spark.kubernetes.driver.connectionTimeout")
-      .doc("connection timeout to be used in milliseconds for requesting executors")
+      .doc("connection timeout to be used in milliseconds for driver to request executors")
       .intConf
       .createWithDefault(10000)
 

diff --git a/...rnetes/core/src/main/scala/org/apache/spark/deploy/k8s/SparkKubernetesClientFactory.scala b/...rnetes/core/src/main/scala/org/apache/spark/deploy/k8s/SparkKubernetesClientFactory.scala
@@ -67,8 +67,6 @@ private[spark] object SparkKubernetesClientFactory extends Logging {
       .getOption(s"$kubernetesAuthConfPrefix.$CLIENT_KEY_FILE_CONF_SUFFIX")
     val clientCertFile = sparkConf
       .getOption(s"$kubernetesAuthConfPrefix.$CLIENT_CERT_FILE_CONF_SUFFIX")
-    val requestTimeout = clientType.requestTimeout(sparkConf)
-    val connectionTimeout = clientType.connectionTimeout(sparkConf)
     val dispatcher = new Dispatcher(
       ThreadUtils.newDaemonCachedThreadPool("kubernetes-dispatcher"))
 
@@ -85,8 +83,8 @@ private[spark] object SparkKubernetesClientFactory extends Logging {
       .withApiVersion("v1")
       .withMasterUrl(master)
       .withWebsocketPingInterval(0)
-      .withRequestTimeout(requestTimeout)
-      .withConnectionTimeout(connectionTimeout)
+      .withRequestTimeout(clientType.requestTimeout(sparkConf))
+      .withConnectionTimeout(clientType.connectionTimeout(sparkConf))
       .withOption(oauthTokenValue) {
         (token, configBuilder) => configBuilder.withOauthToken(token)
       }.withOption(oauthTokenFile) {