Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion bin/manager_start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,19 @@ if [ -n "$6" ]; then
SPARK_SUBMIT_OPTIONS="$SPARK_SUBMIT_OPTIONS --proxy-user $6"
fi

if [ "$SEPARATE_EXECUTOR_LOGGING" = "true" ]
then
export EXECUTOR_LOGGING_OPTS=""
else
export EXECUTOR_LOGGING_OPTS="$LOGGING_OPTS"
fi

if [ -n "$JOBSERVER_KEYTAB" ]; then
SPARK_SUBMIT_OPTIONS="$SPARK_SUBMIT_OPTIONS --keytab $JOBSERVER_KEYTAB"
fi

cmd='$SPARK_HOME/bin/spark-submit --class $MAIN --driver-memory $JOBSERVER_MEMORY
--conf "spark.executor.extraJavaOptions=$LOGGING_OPTS"
--conf "spark.executor.extraJavaOptions=$EXECUTOR_LOGGING_OPTS"
$SPARK_SUBMIT_OPTIONS
--driver-java-options "$GC_OPTS $JAVA_OPTS $LOGGING_OPTS $CONFIG_OVERRIDES $SPARK_SUBMIT_JAVA_OPTIONS"
$JAR_FILE $3 $4 $CONF_FILE'
Expand Down
9 changes: 8 additions & 1 deletion bin/server_start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,15 @@ if [ -f "$PIDFILE" ] && kill -0 $(cat "$PIDFILE"); then
exit 1
fi

if [ "$SEPARATE_EXECUTOR_LOGGING" = "true" ]
then
export EXECUTOR_LOGGING_OPTS=""
else
export EXECUTOR_LOGGING_OPTS="$LOGGING_OPTS"
fi

cmd='$SPARK_HOME/bin/spark-submit --class $MAIN --driver-memory $JOBSERVER_MEMORY
--conf "spark.executor.extraJavaOptions=$LOGGING_OPTS"
--conf "spark.executor.extraJavaOptions=$EXECUTOR_LOGGING_OPTS"
--driver-java-options "$GC_OPTS $JAVA_OPTS $LOGGING_OPTS $CONFIG_OVERRIDES"
$@ $appdir/spark-job-server.jar $conffile'

Expand Down