From cede3e0cfa2e00c73197491e4ef0e988d5430937 Mon Sep 17 00:00:00 2001
From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com>
Date: Fri, 11 Jul 2025 11:44:39 +0200
Subject: [PATCH] fix: ensure spark entrypoint executes the post hook

---
 spark-k8s/stackable/run-spark.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/spark-k8s/stackable/run-spark.sh b/spark-k8s/stackable/run-spark.sh
index 246f91f7b..f00b5c32b 100755
--- a/spark-k8s/stackable/run-spark.sh
+++ b/spark-k8s/stackable/run-spark.sh
@@ -1,10 +1,17 @@
 #!/bin/bash
 
+SPARK_CONTAINER_EXIT_CODE=0
+
 eval "$_STACKABLE_PRE_HOOK"
 
-/stackable/spark/kubernetes/dockerfiles/spark/entrypoint.sh "$@"
-result=$?
+cleanup() {
+    eval "$_STACKABLE_POST_HOOK"
+    exit $SPARK_CONTAINER_EXIT_CODE
+}
 
-eval "$_STACKABLE_POST_HOOK"
+trap 'cleanup' SIGTERM SIGINT
+
+/stackable/spark/kubernetes/dockerfiles/spark/entrypoint.sh "$@"
+SPARK_CONTAINER_EXIT_CODE=$?
 
-exit $result
+cleanup