File tree Expand file tree Collapse file tree 2 files changed +16
-2
lines changed Expand file tree Collapse file tree 2 files changed +16
-2
lines changed Original file line number Diff line number Diff line change @@ -55,12 +55,19 @@ if [ -n "$6" ]; then
5555 SPARK_SUBMIT_OPTIONS=" $SPARK_SUBMIT_OPTIONS --proxy-user $6 "
5656fi
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+
5865if [ -n " $JOBSERVER_KEYTAB " ]; then
5966 SPARK_SUBMIT_OPTIONS=" $SPARK_SUBMIT_OPTIONS --keytab $JOBSERVER_KEYTAB "
6067fi
6168
6269cmd=' $SPARK_HOME/bin/spark-submit --class $MAIN --driver-memory $JOBSERVER_MEMORY
63- --conf "spark.executor.extraJavaOptions=$LOGGING_OPTS "
70+ --conf "spark.executor.extraJavaOptions=$EXECUTOR_LOGGING_OPTS "
6471 $SPARK_SUBMIT_OPTIONS
6572 --driver-java-options "$GC_OPTS $JAVA_OPTS $LOGGING_OPTS $CONFIG_OVERRIDES $SPARK_SUBMIT_JAVA_OPTIONS"
6673 $JAR_FILE $3 $4 $CONF_FILE'
Original file line number Diff line number Diff line change @@ -43,8 +43,15 @@ if [ -f "$PIDFILE" ] && kill -0 $(cat "$PIDFILE"); then
4343 exit 1
4444fi
4545
46+ if [ " $SEPARATE_EXECUTOR_LOGGING " = " true" ]
47+ then
48+ export EXECUTOR_LOGGING_OPTS=" "
49+ else
50+ export EXECUTOR_LOGGING_OPTS=" $LOGGING_OPTS "
51+ fi
52+
4653cmd=' $SPARK_HOME/bin/spark-submit --class $MAIN --driver-memory $JOBSERVER_MEMORY
47- --conf "spark.executor.extraJavaOptions=$LOGGING_OPTS "
54+ --conf "spark.executor.extraJavaOptions=$EXECUTOR_LOGGING_OPTS "
4855 --driver-java-options "$GC_OPTS $JAVA_OPTS $LOGGING_OPTS $CONFIG_OVERRIDES"
4956 $@ $appdir/spark-job-server.jar $conffile'
5057
You can’t perform that action at this time.
0 commit comments