Skip to content

fix: spark-k8s graceful shutdown on SIGTERM #1564

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

Merged
Maleware merged 7 commits into from
Jul 3, 2026
Merged

fix: spark-k8s graceful shutdown on SIGTERM #1564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7266790
fix: spark-k8s graceful shutdown on SIGTERM
Maleware Jul 3, 2026
71967e8
Merge branch 'main' into fix/spark-graceful-shutdown
Maleware Jul 3, 2026
675cf08
better formatting
Maleware Jul 3, 2026
edc3c44
Merge branch 'fix/spark-graceful-shutdown' of https://github.com/stac…
Maleware Jul 3, 2026
0e4f39e
fixing pre-commit hook false positive
Maleware Jul 3, 2026
529c0c5
fixing formatting
Maleware Jul 3, 2026
fc41d15
update changelog
Maleware Jul 3, 2026
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: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ All notable changes to this project will be documented in this file.
- spark: bump hadoop `3.4.2` to `3.4.3` ([#1533])
- hive: Bump `4.2.0` to Hadoop `3.4.3` ([#1539]).
- java-devel: Bump Maven to 3.9.16 ([#1548]).
- spark: fix graceful shutdown at SIGTERM ([#1564])

### Fixed

Expand Down Expand Up @@ -95,6 +96,7 @@ All notable changes to this project will be documented in this file.
[#1550]: https://github.com/stackabletech/docker-images/pull/1550
[#1551]: https://github.com/stackabletech/docker-images/pull/1551
[#1559]: https://github.com/stackabletech/docker-images/pull/1559
[#1564]: https://github.com/stackabletech/docker-images/pull/1564

## [26.3.0] - 2026-03-16

Expand Down
2 changes: 1 addition & 1 deletion spark-k8s/Dockerfile.3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,4 +258,4 @@ EOF
USER ${STACKABLE_USER_UID}

WORKDIR ${SPARK_HOME}
ENTRYPOINT [ "/stackable/run-spark.sh" ]
ENTRYPOINT [ "/usr/bin/tini", "-s", "--", "/stackable/run-spark.sh" ]
2 changes: 1 addition & 1 deletion spark-k8s/Dockerfile.4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,4 +230,4 @@ EOF
USER ${STACKABLE_USER_UID}

WORKDIR ${SPARK_HOME}
ENTRYPOINT [ "/stackable/run-spark.sh" ]
ENTRYPOINT [ "/usr/bin/tini", "-s", "--", "/stackable/run-spark.sh" ]
16 changes: 15 additions & 1 deletion spark-k8s/stackable/run-spark.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,21 @@

eval "$_STACKABLE_PRE_HOOK"

/stackable/spark/kubernetes/dockerfiles/spark/entrypoint.sh "$@"
# Forward SIGTERM to the Spark entrypoint to support spark JVM's gracefully shutdown.
/stackable/spark/kubernetes/dockerfiles/spark/entrypoint.sh "$@" &
child_pid=$!

# shellcheck disable=SC2329
_handle_term() {
kill -TERM "$child_pid" 2>/dev/null || true
}
trap _handle_term TERM INT

# `wait` returns immediately when the trap fires; loop until the child is actually gone.
wait "$child_pid"
while kill -0 "$child_pid" 2>/dev/null; do
wait "$child_pid" 2>/dev/null || true
done
result=$?

eval "$_STACKABLE_POST_HOOK"
Expand Down