Skip to content

Commit

Permalink
[KYUUBI #5856] Bump Spark 3.4.2
Browse files Browse the repository at this point in the history
This pull request fixes #5856

- [ ] Bugfix (non-breaking change which fixes an issue)
- [x] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)

---

- [x] My code follows the [style guidelines](https://kyuubi.readthedocs.io/en/master/contributing/code/style.html) of this project
- [x] I have performed a self-review
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my feature works
- [ ] New and existing unit tests pass locally with my changes
- [x] This patch was not authored or co-authored using [Generative Tooling](https://www.apache.org/legal/generative-tooling.html)

- [x] Pull request title is okay.
- [x] No license issues.
- [x] Milestone correctly set?
- [x] Test coverage is ok
- [x] Assignees are selected.
- [x] Minimum number of approvals
- [x] No changes are requested

**Be nice. Be informative.**

Closes #5859 from zml1206/KYUUBI-5856.

Closes #5856

872fd06 [zml1206] Revert changes in SparkProcessBuilderSuite
bc4996f [zml1206] Bump spark 3.4.2

Authored-by: zml1206 <zhuml1206@gmail.com>
Signed-off-by: Cheng Pan <chengpan@apache.org>
(cherry picked from commit b3d33ca)
Signed-off-by: Cheng Pan <chengpan@apache.org>
  • Loading branch information
zml1206 authored and pan3793 committed Dec 19, 2023
1 parent cffcb88 commit ad496ae
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ jobs:
with:
# passthrough CI into build container
build-args: |
CI=${CI}
CI=${CI}
MVN_ARG=--flink-provided --hive-provided -Dmaven.javadoc.skip=true -Drat.skip=true -Dscalastyle.skip=true -Dspotless.check.skip -DskipTests
context: .
file: build/Dockerfile
Expand All @@ -467,8 +467,8 @@ jobs:
# https://minikube.sigs.k8s.io/docs/handbook/pushing/#7-loading-directly-to-in-cluster-container-runtime
minikube image load apache/kyuubi:latest
# pre-install spark into minikube
docker pull apache/spark:3.4.1
minikube image load apache/spark:3.4.1
docker pull apache/spark:3.4.2
minikube image load apache/spark:3.4.2
- name: kubectl pre-check
run: |
kubectl get nodes
Expand Down
2 changes: 1 addition & 1 deletion docker/playground/.env
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ KYUUBI_HADOOP_VERSION=3.3.6
POSTGRES_VERSION=12
POSTGRES_JDBC_VERSION=42.3.4
SCALA_BINARY_VERSION=2.12
SPARK_VERSION=3.4.1
SPARK_VERSION=3.4.2
SPARK_BINARY_VERSION=3.4
SPARK_HADOOP_VERSION=3.3.4
ZOOKEEPER_VERSION=3.6.3
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class KyuubiOnKubernetesWithSparkTestsBase extends WithKyuubiServerOnKubernetes
Map(
"spark.master" -> s"k8s://$miniKubeApiMaster",
// We should update spark docker image in ./github/workflows/master.yml at the same time
"spark.kubernetes.container.image" -> "apache/spark:3.4.1",
"spark.kubernetes.container.image" -> "apache/spark:3.4.2",
"spark.kubernetes.container.image.pullPolicy" -> "IfNotPresent",
"spark.executor.memory" -> "512M",
"spark.driver.memory" -> "1024M",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ abstract class SparkOnKubernetesSuiteBase
// TODO Support more Spark version
// Spark official docker image: https://hub.docker.com/r/apache/spark/tags
KyuubiConf().set("spark.master", s"k8s://$apiServerAddress")
.set("spark.kubernetes.container.image", "apache/spark:3.4.1")
.set("spark.kubernetes.container.image", "apache/spark:3.4.2")
.set("spark.kubernetes.container.image.pullPolicy", "IfNotPresent")
.set("spark.executor.instances", "1")
.set("spark.executor.memory", "512M")
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
DO NOT forget to change the following properties when change the minor version of Spark:
`delta.version`, `maven.plugin.scalatest.exclude.tags`
-->
<spark.version>3.4.1</spark.version>
<spark.version>3.4.2</spark.version>
<spark.binary.version>3.4</spark.binary.version>
<spark.archive.scala.suffix></spark.archive.scala.suffix>
<spark.archive.name>spark-${spark.version}-bin-hadoop3${spark.archive.scala.suffix}.tgz</spark.archive.name>
Expand Down Expand Up @@ -2219,7 +2219,7 @@
</modules>
<properties>
<delta.version>2.4.0</delta.version>
<spark.version>3.4.1</spark.version>
<spark.version>3.4.2</spark.version>
<spark.binary.version>3.4</spark.binary.version>
<maven.plugin.scalatest.exclude.tags>org.scalatest.tags.Slow</maven.plugin.scalatest.exclude.tags>
</properties>
Expand Down

0 comments on commit ad496ae

Please sign in to comment.