File tree Expand file tree Collapse file tree
resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -100,13 +100,13 @@ private[spark] object Config extends Logging {
100100
101101 val DRIVER_CLIENT_REQUEST_TIMEOUT =
102102 ConfigBuilder (" spark.kubernetes.driver.requestTimeout" )
103- .doc(" request timeout to be used in milliseconds for requesting executors" )
103+ .doc(" request timeout to be used in milliseconds for driver to request executors" )
104104 .intConf
105105 .createWithDefault(10000 )
106106
107107 val DRIVER_CLIENT_CONNECTION_TIMEOUT =
108108 ConfigBuilder (" spark.kubernetes.driver.connectionTimeout" )
109- .doc(" connection timeout to be used in milliseconds for requesting executors" )
109+ .doc(" connection timeout to be used in milliseconds for driver to request executors" )
110110 .intConf
111111 .createWithDefault(10000 )
112112
Original file line number Diff line number Diff line change @@ -67,8 +67,6 @@ private[spark] object SparkKubernetesClientFactory extends Logging {
6767 .getOption(s " $kubernetesAuthConfPrefix. $CLIENT_KEY_FILE_CONF_SUFFIX" )
6868 val clientCertFile = sparkConf
6969 .getOption(s " $kubernetesAuthConfPrefix. $CLIENT_CERT_FILE_CONF_SUFFIX" )
70- val requestTimeout = clientType.requestTimeout(sparkConf)
71- val connectionTimeout = clientType.connectionTimeout(sparkConf)
7270 val dispatcher = new Dispatcher (
7371 ThreadUtils .newDaemonCachedThreadPool(" kubernetes-dispatcher" ))
7472
@@ -85,8 +83,8 @@ private[spark] object SparkKubernetesClientFactory extends Logging {
8583 .withApiVersion(" v1" )
8684 .withMasterUrl(master)
8785 .withWebsocketPingInterval(0 )
88- .withRequestTimeout(requestTimeout)
89- .withConnectionTimeout(connectionTimeout)
86+ .withRequestTimeout(clientType. requestTimeout(sparkConf) )
87+ .withConnectionTimeout(clientType. connectionTimeout(sparkConf) )
9088 .withOption(oauthTokenValue) {
9189 (token, configBuilder) => configBuilder.withOauthToken(token)
9290 }.withOption(oauthTokenFile) {
You can’t perform that action at this time.
0 commit comments