Skip to content

Commit f8af803

Browse files
committed
DSP-19969 allow spark executor log to separate file
1 parent c91e56f commit f8af803

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

bin/manager_start.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,13 @@ if [ -n "$6" ]; then
5555
SPARK_SUBMIT_OPTIONS="$SPARK_SUBMIT_OPTIONS --proxy-user $6"
5656
fi
5757

58+
if [ "$SEPARATE_EXECUTOR_LOGGING" = "true" ]
59+
then
60+
export EXECUTOR_LOGGING_OPTS=""
61+
else
62+
export EXECUTOR_LOGGING_OPTS="$LOGGING_OPTS"
63+
fi
64+
5865
if [ -n "$JOBSERVER_KEYTAB" ]; then
5966
SPARK_SUBMIT_OPTIONS="$SPARK_SUBMIT_OPTIONS --keytab $JOBSERVER_KEYTAB"
6067
fi
@@ -64,7 +71,7 @@ if [ -z "${SJS_LAUNCHER}" ]; then
6471
fi
6572

6673
cmd='$SJS_LAUNCHER --class $MAIN --driver-memory $JOBSERVER_MEMORY
67-
--conf "spark.executor.extraJavaOptions=$LOGGING_OPTS"
74+
--conf "spark.executor.extraJavaOptions=$EXECUTOR_LOGGING_OPTS"
6875
$SPARK_SUBMIT_OPTIONS
6976
--driver-java-options "$GC_OPTS $JAVA_OPTS $LOGGING_OPTS $CONFIG_OVERRIDES $SPARK_SUBMIT_JAVA_OPTIONS"
7077
$JAR_FILE $3 $4 $CONF_FILE'

bin/server_start.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,15 @@ if [ -z "${SJS_LAUNCHER}" ]; then
4747
export SJS_LAUNCHER="$SPARK_HOME/bin/spark-submit"
4848
fi
4949

50+
if [ "$SEPARATE_EXECUTOR_LOGGING" = "true" ]
51+
then
52+
export EXECUTOR_LOGGING_OPTS=""
53+
else
54+
export EXECUTOR_LOGGING_OPTS="$LOGGING_OPTS"
55+
fi
56+
5057
cmd='$SJS_LAUNCHER --class $MAIN --driver-memory $JOBSERVER_MEMORY
51-
--conf "spark.executor.extraJavaOptions=$LOGGING_OPTS"
58+
--conf "spark.executor.extraJavaOptions=$EXECUTOR_LOGGING_OPTS"
5259
--driver-java-options "$GC_OPTS $JAVA_OPTS $LOGGING_OPTS $CONFIG_OVERRIDES"
5360
$@ $appdir/spark-job-server.jar $conffile'
5461

0 commit comments

Comments
 (0)