Skip to content

Commit db5d412

Browse files
committed
DSP-13401 Add a way to configure SJS launcher
DSE uses different launchers for different versions of Resource Managers.
1 parent 002a05c commit db5d412

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

bin/manager_start.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,11 @@ if [ -n "$JOBSERVER_KEYTAB" ]; then
5959
SPARK_SUBMIT_OPTIONS="$SPARK_SUBMIT_OPTIONS --keytab $JOBSERVER_KEYTAB"
6060
fi
6161

62-
cmd='$SPARK_HOME/bin/spark-submit --class $MAIN --driver-memory $JOBSERVER_MEMORY
62+
if [ -z "${SJS_LAUNCHER}" ]; then
63+
export SJS_LAUNCHER="$SPARK_HOME/bin/spark-submit"
64+
fi
65+
66+
cmd='$SJS_LAUNCHER --class $MAIN --driver-memory $JOBSERVER_MEMORY
6367
--conf "spark.executor.extraJavaOptions=$LOGGING_OPTS"
6468
$SPARK_SUBMIT_OPTIONS
6569
--driver-java-options "$GC_OPTS $JAVA_OPTS $LOGGING_OPTS $CONFIG_OVERRIDES $SPARK_SUBMIT_JAVA_OPTIONS"

bin/server_start.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,11 @@ if [ -f "$PIDFILE" ] && kill -0 $(cat "$PIDFILE"); then
4343
exit 1
4444
fi
4545

46-
cmd='$SPARK_HOME/bin/spark-submit --class $MAIN --driver-memory $JOBSERVER_MEMORY
46+
if [ -z "${SJS_LAUNCHER}" ]; then
47+
export SJS_LAUNCHER="$SPARK_HOME/bin/spark-submit"
48+
fi
49+
50+
cmd='$SJS_LAUNCHER --class $MAIN --driver-memory $JOBSERVER_MEMORY
4751
--conf "spark.executor.extraJavaOptions=$LOGGING_OPTS"
4852
--driver-java-options "$GC_OPTS $JAVA_OPTS $LOGGING_OPTS $CONFIG_OVERRIDES"
4953
$@ $appdir/spark-job-server.jar $conffile'

0 commit comments

Comments
 (0)