Skip to content

Commit 78bdcfa

Browse files
igorcalabriadongjoon-hyun
authored andcommitted
[SPARK-27812][K8S] Bump K8S client version to 4.6.1
### What changes were proposed in this pull request? Updated kubernetes client. ### Why are the changes needed? https://issues.apache.org/jira/browse/SPARK-27812 https://issues.apache.org/jira/browse/SPARK-27927 We need this fix fabric8io/kubernetes-client#1768 that was released on version 4.6 of the client. The root cause of the problem is better explained in #25785 ### Does this PR introduce any user-facing change? Nope, it should be transparent to users ### How was this patch tested? This patch was tested manually using a simple pyspark job ```python from pyspark.sql import SparkSession if __name__ == '__main__': spark = SparkSession.builder.getOrCreate() ``` The expected behaviour of this "job" is that both python's and jvm's process exit automatically after the main runs. This is the case for spark versions <= 2.4. On version 2.4.3, the jvm process hangs because there's a non daemon thread running ``` "OkHttp WebSocket https://10.96.0.1/..." #121 prio=5 os_prio=0 tid=0x00007fb27c005800 nid=0x24b waiting on condition [0x00007fb300847000] "OkHttp WebSocket https://10.96.0.1/..." #117 prio=5 os_prio=0 tid=0x00007fb28c004000 nid=0x247 waiting on condition [0x00007fb300e4b000] ``` This is caused by a bug on `kubernetes-client` library, which is fixed on the version that we are upgrading to. When the mentioned job is run with this patch applied, the behaviour from spark <= 2.4.3 is restored and both processes terminate successfully Closes #26093 from igorcalabria/k8s-client-update. Authored-by: igor.calabria <igor.calabria@ubee.in> Signed-off-by: Dongjoon Hyun <dhyun@apple.com>
1 parent 100fc58 commit 78bdcfa

File tree

4 files changed

+12
-20
lines changed

4 files changed

+12
-20
lines changed

dev/deps/spark-deps-hadoop-2.7

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ jakarta.ws.rs-api-2.1.5.jar
107107
jakarta.xml.bind-api-2.3.2.jar
108108
janino-3.0.15.jar
109109
javassist-3.22.0-CR2.jar
110-
javax.el-3.0.1-b11.jar
111110
javax.inject-1.jar
112111
javax.servlet-api-3.1.0.jar
113112
javolution-5.5.1.jar
@@ -138,9 +137,9 @@ jsr305-3.0.0.jar
138137
jta-1.1.jar
139138
jul-to-slf4j-1.7.16.jar
140139
kryo-shaded-4.0.2.jar
141-
kubernetes-client-4.4.2.jar
142-
kubernetes-model-4.4.2.jar
143-
kubernetes-model-common-4.4.2.jar
140+
kubernetes-client-4.6.1.jar
141+
kubernetes-model-4.6.1.jar
142+
kubernetes-model-common-4.6.1.jar
144143
leveldbjni-all-1.8.jar
145144
libfb303-0.9.3.jar
146145
libthrift-0.12.0.jar
@@ -158,8 +157,8 @@ minlog-1.3.0.jar
158157
netty-all-4.1.42.Final.jar
159158
objenesis-2.5.1.jar
160159
okapi-shade-0.4.2.jar
161-
okhttp-3.8.1.jar
162-
okio-1.13.0.jar
160+
okhttp-3.12.0.jar
161+
okio-1.15.0.jar
163162
opencsv-2.3.jar
164163
orc-core-1.5.6-nohive.jar
165164
orc-mapreduce-1.5.6-nohive.jar

dev/deps/spark-deps-hadoop-3.2

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ jakarta.ws.rs-api-2.1.5.jar
120120
jakarta.xml.bind-api-2.3.2.jar
121121
janino-3.0.15.jar
122122
javassist-3.22.0-CR2.jar
123-
javax.el-3.0.1-b11.jar
124123
javax.inject-1.jar
125124
javax.jdo-3.2.0-m3.jar
126125
javax.servlet-api-3.1.0.jar
@@ -168,9 +167,9 @@ kerby-pkix-1.0.1.jar
168167
kerby-util-1.0.1.jar
169168
kerby-xdr-1.0.1.jar
170169
kryo-shaded-4.0.2.jar
171-
kubernetes-client-4.4.2.jar
172-
kubernetes-model-4.4.2.jar
173-
kubernetes-model-common-4.4.2.jar
170+
kubernetes-client-4.6.1.jar
171+
kubernetes-model-4.6.1.jar
172+
kubernetes-model-common-4.6.1.jar
174173
leveldbjni-all-1.8.jar
175174
libfb303-0.9.3.jar
176175
libthrift-0.12.0.jar
@@ -191,8 +190,8 @@ nimbus-jose-jwt-4.41.1.jar
191190
objenesis-2.5.1.jar
192191
okapi-shade-0.4.2.jar
193192
okhttp-2.7.5.jar
194-
okhttp-3.8.1.jar
195-
okio-1.13.0.jar
193+
okhttp-3.12.0.jar
194+
okio-1.15.0.jar
196195
opencsv-2.3.jar
197196
orc-core-1.5.6.jar
198197
orc-mapreduce-1.5.6.jar

resource-managers/kubernetes/core/pom.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<name>Spark Project Kubernetes</name>
3030
<properties>
3131
<sbt.project.name>kubernetes</sbt.project.name>
32-
<kubernetes.client.version>4.4.2</kubernetes.client.version>
32+
<kubernetes.client.version>4.6.1</kubernetes.client.version>
3333
</properties>
3434

3535
<dependencies>
@@ -88,12 +88,6 @@
8888
</dependency>
8989
<!-- End of shaded deps. -->
9090

91-
<dependency>
92-
<groupId>com.squareup.okhttp3</groupId>
93-
<artifactId>okhttp</artifactId>
94-
<version>3.8.1</version>
95-
</dependency>
96-
9791
<dependency>
9892
<groupId>org.mockito</groupId>
9993
<artifactId>mockito-core</artifactId>

resource-managers/kubernetes/integration-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<download-maven-plugin.version>1.3.0</download-maven-plugin.version>
3030
<exec-maven-plugin.version>1.4.0</exec-maven-plugin.version>
3131
<extraScalaTestArgs></extraScalaTestArgs>
32-
<kubernetes-client.version>4.4.2</kubernetes-client.version>
32+
<kubernetes-client.version>4.6.1</kubernetes-client.version>
3333
<scala-maven-plugin.version>3.2.2</scala-maven-plugin.version>
3434
<scalatest-maven-plugin.version>1.0</scalatest-maven-plugin.version>
3535
<sbt.project.name>kubernetes-integration-tests</sbt.project.name>

0 commit comments

Comments
 (0)