Skip to content

DSP-19969 allow spark executor log to separate file #30

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

Open
wants to merge 1 commit into
base: dse-2
Choose a base branch
from
Open

DSP-19969 allow spark executor log to separate file #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions bin/manager_start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,22 @@ JAVA_OPTS="-XX:MaxDirectMemorySize=$MAX_DIRECT_MEMORY

MAIN="spark.jobserver.JobManager"

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

if [ ! -z $3 ]; then
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"
--proxy-user $3
--driver-java-options "$GC_OPTS $JAVA_OPTS $LOGGING_OPTS $CONFIG_OVERRIDES"
$appdir/spark-job-server.jar $1 $2 $conffile'
else
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 $1 $2 $conffile'
fi
Expand Down
9 changes: 8 additions & 1 deletion bin/server_start.sh
View file
Open in desktop
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