Revert changes

canonical · Jul 3, 2024 · 4fe58a6 · 4fe58a6
1 parent fb56bc5
commit 4fe58a6
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 9 deletions.
diff --git a/images/charmed-spark-gpu/bin-spark b/images/charmed-spark-gpu/bin-spark
diff --git a/images/charmed-spark-gpu/bin/history-server.sh b/images/charmed-spark-gpu/bin/history-server.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+pushd /opt/spark
+mkdir -p /tmp/spark-events
+export SPARK_NO_DAEMONIZE="true"
+/opt/spark/sbin/start-history-server.sh --properties-file ${SPARK_PROPERTIES_FILE}
diff --git a/images/charmed-spark-gpu/bin/spark-client.pyspark b/images/charmed-spark-gpu/bin/spark-client.pyspark
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+python3 -m spark8t.cli.pyspark $*
diff --git a/images/charmed-spark-gpu/bin/spark-client.service-account-registry b/images/charmed-spark-gpu/bin/spark-client.service-account-registry
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+python3 -m spark8t.cli.service_account_registry $*
diff --git a/images/charmed-spark-gpu/bin/spark-client.spark-shell b/images/charmed-spark-gpu/bin/spark-client.spark-shell
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+python3 -m spark8t.cli.spark_shell $*
diff --git a/images/charmed-spark-gpu/bin/spark-client.spark-sql b/images/charmed-spark-gpu/bin/spark-client.spark-sql
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+python3 -m spark8t.cli.spark_sql $*
diff --git a/images/charmed-spark-gpu/bin/spark-client.spark-submit b/images/charmed-spark-gpu/bin/spark-client.spark-submit
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+python3 -m spark8t.cli.spark_submit $*
diff --git a/images/charmed-spark-gpu/bin/sparkd.sh b/images/charmed-spark-gpu/bin/sparkd.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+function finish {
+  if [ $? -ne 0 ]
+  then
+    kill -1 1
+    sleep 1
+  fi
+}
+trap finish EXIT
+
+
+FLAVOUR=$1
+
+echo "Running script with ${FLAVOUR} flavour"
+
+case "${FLAVOUR}" in
+  driver|executor)
+    pushd /opt/spark
+    ./entrypoint.sh "$@"
+    ;;
+  "")
+    # Infinite sleep to allow pebble to be running indefinitely
+    sleep inf
+    ;;
+  *)
+    echo "Component \"${FLAVOUR}\" unknown"
+    exit 1
+    ;;
+esac
diff --git a/images/charmed-spark-gpu/rockcraft.yaml b/images/charmed-spark-gpu/rockcraft.yaml
@@ -174,15 +174,14 @@ parts:
     plugin: dump
     after: [ spark8t, spark ]
     source: .
-    source-type: local
     organize:
-      bin-spark/sparkd.sh: opt/pebble/sparkd.sh
-      bin-spark/history-server.sh: opt/pebble/history-server.sh
-      bin-spark/spark-client.pyspark: opt/spark-client/python/bin/spark-client.pyspark
-      bin-spark/spark-client.spark-sql: opt/spark-client/python/bin/spark-client.spark-sql
-      bin-spark/spark-client.service-account-registry: opt/spark-client/python/bin/spark-client.service-account-registry
-      bin-spark/spark-client.spark-shell: opt/spark-client/python/bin/spark-client.spark-shell
-      bin-spark/spark-client.spark-submit: opt/spark-client/python/bin/spark-client.spark-submit
+      bin/sparkd.sh: opt/pebble/sparkd.sh
+      bin/history-server.sh: opt/pebble/history-server.sh
+      bin/spark-client.pyspark: opt/spark-client/python/bin/spark-client.pyspark
+      bin/spark-client.spark-sql: opt/spark-client/python/bin/spark-client.spark-sql
+      bin/spark-client.service-account-registry: opt/spark-client/python/bin/spark-client.service-account-registry
+      bin/spark-client.spark-shell: opt/spark-client/python/bin/spark-client.spark-shell
+      bin/spark-client.spark-submit: opt/spark-client/python/bin/spark-client.spark-submit
       conf/spark-defaults.conf: etc/spark8t/conf/spark-defaults.conf
       bin/getGpusResources.sh: opt/getGpusResources.sh
     stage:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/bin/bash

		python3 -m spark8t.cli.service_account_registry $*
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/bin/bash

		python3 -m spark8t.cli.spark_shell $*
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/bin/bash

		python3 -m spark8t.cli.spark_sql $*
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/bin/bash

		python3 -m spark8t.cli.spark_submit $*