Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Spark 3.5.4 #6842

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Bump Spark 3.5.4 #6842

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
951db0c
Spark 3.5.4
pan3793 Dec 9, 2024
49e98a2
maven repo
pan3793 Dec 9, 2024
0721fa4
fix
pan3793 Dec 10, 2024
8eacc9c
Spark 3.5.4 RC2
pan3793 Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,7 @@ 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
# TODO
docker pull apache/spark:3.5.2
minikube image load apache/spark:3.5.2
- name: kubectl pre-check
Expand Down
4 changes: 2 additions & 2 deletions bin/docker-image-tool.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,8 @@ Examples:
$0 -r docker.io/myrepo -t v1.8.1 build
$0 -r docker.io/myrepo -t v1.8.1 push

- Build and push with tag "v1.8.1" and Spark-3.5.2 as base image to docker.io/myrepo
$0 -r docker.io/myrepo -t v1.8.1 -b BASE_IMAGE=repo/spark:3.5.2 build
- Build and push with tag "v1.8.1" and Spark-3.5.4 as base image to docker.io/myrepo
$0 -r docker.io/myrepo -t v1.8.1 -b BASE_IMAGE=repo/spark:3.5.4 build
$0 -r docker.io/myrepo -t v1.8.1 push

- Build and push for multiple archs to docker.io/myrepo
Expand Down
4 changes: 2 additions & 2 deletions docs/deployment/kyuubi_on_kubernetes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ Examples:
$0 -r docker.io/myrepo -t v1.8.1 build
$0 -r docker.io/myrepo -t v1.8.1 push

- Build and push with tag "v1.8.1" and Spark-3.5.2 as base image to docker.io/myrepo
$0 -r docker.io/myrepo -t v1.8.1 -b BASE_IMAGE=repo/spark:3.5.2 build
- Build and push with tag "v1.8.1" and Spark-3.5.4 as base image to docker.io/myrepo
$0 -r docker.io/myrepo -t v1.8.1 -b BASE_IMAGE=repo/spark:3.5.4 build
$0 -r docker.io/myrepo -t v1.8.1 push

- Build and push for multiple archs to docker.io/myrepo
Expand Down
2 changes: 1 addition & 1 deletion docs/extensions/engines/spark/lineage.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ Sometimes, it may be incompatible with other Spark distributions, then you may n
For example,

```shell
build/mvn clean package -pl :kyuubi-spark-lineage_2.12 -am -DskipTests -Dspark.version=3.5.2
build/mvn clean package -pl :kyuubi-spark-lineage_2.12 -am -DskipTests -Dspark.version=3.5.4
```

The available `spark.version`s are shown in the following table.
Expand Down
2 changes: 1 addition & 1 deletion ...est/scala/org/apache/kyuubi/kubernetes/test/deployment/KyuubiOnKubernetesTestsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,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.5.2",
"spark.kubernetes.container.image" -> "apache/spark:3.5.2", // TODO
"spark.kubernetes.container.image.pullPolicy" -> "IfNotPresent",
"spark.executor.memory" -> "512M",
"spark.driver.memory" -> "1024M",
Expand Down
2 changes: 1 addition & 1 deletion .../src/test/scala/org/apache/kyuubi/kubernetes/test/spark/SparkOnKubernetesTestsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,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.5.2")
.set("spark.kubernetes.container.image", "apache/spark:3.5.2") // TODO
.set("spark.kubernetes.container.image.pullPolicy", "IfNotPresent")
.set("spark.executor.instances", "1")
.set("spark.executor.memory", "512M")
Expand Down
22 changes: 19 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,11 @@
DO NOT forget to change the following properties when change the minor version of Spark:
`delta.version`, `delta.artifact`, `maven.plugin.scalatest.exclude.tags`
-->
<spark.version>3.5.2</spark.version>
<spark.version>3.5.4</spark.version>
<spark.binary.version>3.5</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>
<spark.archive.mirror>${apache.archive.dist}/spark/spark-${spark.version}</spark.archive.mirror>
<spark.archive.mirror>https://dist.apache.org/repos/dist/dev/spark/v3.5.4-rc1-bin</spark.archive.mirror>
<spark.archive.download.skip>false</spark.archive.download.skip>
<sqlite.version>3.46.1.3</sqlite.version>
<supercsv.version>2.2.0</supercsv.version>
Expand Down Expand Up @@ -1282,6 +1282,18 @@
<name>Maven Repository</name>
<url>https://repo.maven.apache.org/maven2</url>
</repository>

<repository>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>spark-3.5.4-rc-staging</id>
<name>Spark 3.5.4 RC Staging</name>
<url>https://repository.apache.org/content/repositories/orgapachespark-1471</url>
</repository>
</repositories>

<pluginRepositories>
Expand Down Expand Up @@ -2002,6 +2014,7 @@
<properties>
<spark.version>3.3.4</spark.version>
<spark.binary.version>3.3</spark.binary.version>
<spark.archive.mirror>${apache.archive.dist}/spark/spark-${spark.version}</spark.archive.mirror>
<delta.version>2.3.0</delta.version>
<delta.artifact>delta-core_${scala.binary.version}</delta.artifact>
<maven.plugin.scalatest.exclude.tags>org.scalatest.tags.Slow</maven.plugin.scalatest.exclude.tags>
Expand All @@ -2017,6 +2030,7 @@
<properties>
<spark.version>3.4.3</spark.version>
<spark.binary.version>3.4</spark.binary.version>
<spark.archive.mirror>${apache.archive.dist}/spark/spark-${spark.version}</spark.archive.mirror>
<delta.version>2.4.0</delta.version>
<delta.artifact>delta-core_${scala.binary.version}</delta.artifact>
<maven.plugin.scalatest.exclude.tags>org.scalatest.tags.Slow</maven.plugin.scalatest.exclude.tags>
Expand All @@ -2030,8 +2044,9 @@
<module>extensions/spark/kyuubi-spark-connector-hive</module>
</modules>
<properties>
<spark.version>3.5.2</spark.version>
<spark.version>3.5.4</spark.version>
<spark.binary.version>3.5</spark.binary.version>
<spark.archive.mirror>https://dist.apache.org/repos/dist/dev/spark/v3.5.4-rc1-bin</spark.archive.mirror>
<delta.version>3.2.0</delta.version>
<delta.artifact>delta-spark_${scala.binary.version}</delta.artifact>
<maven.plugin.scalatest.exclude.tags>org.scalatest.tags.Slow</maven.plugin.scalatest.exclude.tags>
Expand All @@ -2046,6 +2061,7 @@
<properties>
<spark.version>4.0.0-preview2</spark.version>
<spark.binary.version>4.0</spark.binary.version>
<spark.archive.mirror>${apache.archive.dist}/spark/spark-${spark.version}</spark.archive.mirror>
<antlr4.version>4.13.1</antlr4.version>
<!-- TODO: update once Delta support Spark 4.0.0-preview2 -->
<delta.version>4.0.0rc1</delta.version>
Expand Down
Loading