Skip to content

[HWORKS-2203] Spark 3.5 #42

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

Open
wants to merge 16 commits into
base: branch-3.5
Choose a base branch
from
Open

[HWORKS-2203] Spark 3.5 #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ebf7612
Hopsfy spark-3.5
gibchikafa Feb 18, 2025
9bdf676
Drop Index support, not compatible with the hive version
gibchikafa Feb 21, 2025
d871e4c
DaysWritableV2
gibchikafa Feb 21, 2025
2135dcf
Exclude com.vlkan:flatbuffers:1.2.0 dependency from build
gibchikafa Feb 21, 2025
3056fcc
Apply uniffle changes
gibchikafa Feb 24, 2025
9374587
Reduce number of event logs flushes (#26)
SirOibaf Oct 5, 2021
eeb2aaa
[HWORKS-1405] Get correct hive version in spark (#40)
gibchikafa Jul 4, 2024
0c3b65b
Timestamp incompatibility Spark/Hive/Hudi - Hive fix - release 3.1.1.3
gibchikafa Feb 21, 2025
0bea3ba
Bump hive version to 3.0.0.13.5 (#39)
gibchikafa Jun 26, 2024
f7d50b2
Change hadoop version
gibchikafa Feb 20, 2025
2a5fee4
Add Hops Repo
gibchikafa Jun 11, 2025
5f98a22
Change version to 3.5.8
gibchikafa Jun 16, 2025
e03729f
Change kafka version to 2.6.0
gibchikafa Jun 16, 2025
8efa025
Change version to 3.5.5
gibchikafa Jun 19, 2025
87f58c0
Add org.codehaus.jackson
gibchikafa Jun 29, 2025
7d8a596
Reset kafka version to 3.4.1
gibchikafa Jun 29, 2025
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
2 changes: 1 addition & 1 deletion R/pkg/DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: SparkR
Type: Package
Version: 3.5.8
Version: 3.5.5
Title: R Front End for 'Apache Spark'
Description: Provides an R Front end for 'Apache Spark' <https://spark.apache.org>.
Authors@R:
Expand Down
4 changes: 2 additions & 2 deletions assembly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.5.8-SNAPSHOT</version>
<version>3.5.5</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -137,7 +137,7 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<groupId>${hadoop.group}</groupId>
<artifactId>hadoop-yarn-server-web-proxy</artifactId>
</dependency>
</dependencies>
Expand Down
2 changes: 2 additions & 0 deletions assembly/src/main/assembly/assembly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@
<useProjectArtifact>false</useProjectArtifact>
<excludes>
<exclude>org.apache.hadoop:*:jar</exclude>
<exclude>io.hops:*:jar</exclude>
<exclude>io.hops.metadata:*:jar</exclude>
<exclude>org.apache.spark:*:jar</exclude>
<exclude>org.apache.zookeeper:*:jar</exclude>
<exclude>org.apache.avro:*:jar</exclude>
Expand Down
2 changes: 1 addition & 1 deletion common/kvstore/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.5.8-SNAPSHOT</version>
<version>3.5.5</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion common/network-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.5.8-SNAPSHOT</version>
<version>3.5.5</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion common/network-shuffle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.5.8-SNAPSHOT</version>
<version>3.5.5</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
6 changes: 3 additions & 3 deletions common/network-yarn/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.5.8-SNAPSHOT</version>
<version>3.5.5</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -64,12 +64,12 @@

<!-- Provided dependencies -->
<dependency>
<groupId>org.apache.hadoop</groupId>
<groupId>${hadoop.group}</groupId>
<artifactId>hadoop-client-api</artifactId>
<version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<groupId>${hadoop.group}</groupId>
<artifactId>hadoop-client-runtime</artifactId>
<version>${hadoop.version}</version>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion common/sketch/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.5.8-SNAPSHOT</version>
<version>3.5.5</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion common/tags/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.5.8-SNAPSHOT</version>
<version>3.5.5</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion common/unsafe/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.5.8-SNAPSHOT</version>
<version>3.5.5</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion common/utils/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.5.8-SNAPSHOT</version>
<version>3.5.5</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion connector/avro/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.5.8-SNAPSHOT</version>
<version>3.5.5</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion connector/connect/client/jvm/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.5.8-SNAPSHOT</version>
<version>3.5.5</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion connector/connect/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.5.8-SNAPSHOT</version>
<version>3.5.5</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion connector/connect/server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.5.8-SNAPSHOT</version>
<version>3.5.5</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions connector/docker-integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.5.8-SNAPSHOT</version>
<version>3.5.5</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -92,7 +92,7 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<groupId>${hadoop.group}</groupId>
<artifactId>hadoop-minikdc</artifactId>
<scope>test</scope>
</dependency>
Expand Down
6 changes: 3 additions & 3 deletions connector/kafka-0-10-assembly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.5.8-SNAPSHOT</version>
<version>3.5.5</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -70,13 +70,13 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<groupId>${hadoop.group}</groupId>
<artifactId>hadoop-client-api</artifactId>
<version>${hadoop.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<groupId>${hadoop.group}</groupId>
<artifactId>hadoop-client-runtime</artifactId>
<version>${hadoop.version}</version>
<scope>provided</scope>
Expand Down
4 changes: 2 additions & 2 deletions connector/kafka-0-10-sql/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.5.8-SNAPSHOT</version>
<version>3.5.5</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -121,7 +121,7 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<groupId>${hadoop.group}</groupId>
<artifactId>hadoop-minikdc</artifactId>
</dependency>
<!-- Kafka embedded server uses Zookeeper 3.5.7 API -->
Expand Down
4 changes: 2 additions & 2 deletions connector/kafka-0-10-token-provider/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.5.8-SNAPSHOT</version>
<version>3.5.5</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -65,7 +65,7 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<groupId>${hadoop.group}</groupId>
<artifactId>hadoop-client-runtime</artifactId>
<scope>${hadoop.deps.scope}</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion connector/kafka-0-10/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.5.8-SNAPSHOT</version>
<version>3.5.5</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
6 changes: 3 additions & 3 deletions connector/kinesis-asl-assembly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.5.8-SNAPSHOT</version>
<version>3.5.5</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -100,13 +100,13 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<groupId>${hadoop.group}</groupId>
<artifactId>hadoop-client-api</artifactId>
<version>${hadoop.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<groupId>${hadoop.group}</groupId>
<artifactId>hadoop-client-runtime</artifactId>
<version>${hadoop.version}</version>
<scope>provided</scope>
Expand Down
2 changes: 1 addition & 1 deletion connector/kinesis-asl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.5.8-SNAPSHOT</version>
<version>3.5.5</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion connector/protobuf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.5.8-SNAPSHOT</version>
<version>3.5.5</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion connector/spark-ganglia-lgpl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.5.8-SNAPSHOT</version>
<version>3.5.5</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
12 changes: 6 additions & 6 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.5.8-SNAPSHOT</version>
<version>3.5.5</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -71,12 +71,12 @@
<artifactId>xbean-asm9-shaded</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<groupId>${hadoop.group}</groupId>
<artifactId>hadoop-client-api</artifactId>
<version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<groupId>${hadoop.group}</groupId>
<artifactId>hadoop-client-runtime</artifactId>
<version>${hadoop.version}</version>
</dependency>
Expand Down Expand Up @@ -426,7 +426,7 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<groupId>${hadoop.group}</groupId>
<artifactId>hadoop-minikdc</artifactId>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -472,13 +472,13 @@
</dependency>

<dependency>
<groupId>org.apache.hadoop</groupId>
<groupId>${hadoop.group}</groupId>
<artifactId>hadoop-aws</artifactId>
<version>${hadoop.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<groupId>${hadoop.group}</groupId>
<artifactId>hadoop-common</artifactId>
</exclusion>
<exclusion>
Expand Down
4 changes: 3 additions & 1 deletion core/src/main/scala/org/apache/spark/ExecutorAllocationManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,9 @@ private[spark] class ExecutorAllocationManager(
s"s${DYN_ALLOCATION_SUSTAINED_SCHEDULER_BACKLOG_TIMEOUT.key} must be > 0!")
}
if (!conf.get(config.SHUFFLE_SERVICE_ENABLED) && !reliableShuffleStorage) {
if (conf.get(config.DYN_ALLOCATION_SHUFFLE_TRACKING_ENABLED)) {
if (conf.isRssEnable()) {
logInfo("Dynamic allocation will use remote shuffle service")
} else if (conf.get(config.DYN_ALLOCATION_SHUFFLE_TRACKING_ENABLED)) {
logInfo("Dynamic allocation is enabled without a shuffle service.")
} else if (decommissionEnabled &&
conf.get(config.STORAGE_DECOMMISSION_SHUFFLE_BLOCKS_ENABLED)) {
Expand Down
7 changes: 7 additions & 0 deletions core/src/main/scala/org/apache/spark/SparkConf.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,13 @@ class SparkConf(loadDefaults: Boolean) extends Cloneable with Logging with Seria
Utils.redact(this, getAll).sorted.map { case (k, v) => k + "=" + v }.mkString("\n")
}

/**
* Return true if remote shuffle service is enabled.
*/
def isRssEnable(): Boolean = {
val shuffleMgr = get("spark.shuffle.manager", "sort")
shuffleMgr.contains("RssShuffleManager") || shuffleMgr.contains("UniffleShuffleManager")
}
}

private[spark] object SparkConf extends Logging {
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2628,7 +2628,8 @@ private[spark] class DAGScheduler(
// we know to unregister shuffle output. (Note that "worker" specifically refers to the process
// from a Standalone cluster, where the shuffle service lives in the Worker.)
val fileLost = !sc.shuffleDriverComponents.supportsReliableStorage() &&
(workerHost.isDefined || !env.blockManager.externalShuffleServiceEnabled)
(workerHost.isDefined || !env.blockManager.externalShuffleServiceEnabled) &&
!sc.getConf.isRssEnable()
removeExecutorAndUnregisterOutputs(
execId = execId,
fileLost = fileLost,
Expand Down
Loading
Loading