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
55
55
SPARK_SUBMIT_OPTIONS=" $SPARK_SUBMIT_OPTIONS --proxy-user $6 "
56
56
fi
57
57
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
+
58
65
if [ -n " $JOBSERVER_KEYTAB " ]; then
59
66
SPARK_SUBMIT_OPTIONS=" $SPARK_SUBMIT_OPTIONS --keytab $JOBSERVER_KEYTAB "
60
67
fi
61
68
62
69
cmd=' $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 "
64
71
$SPARK_SUBMIT_OPTIONS
65
72
--driver-java-options "$GC_OPTS $JAVA_OPTS $LOGGING_OPTS $CONFIG_OVERRIDES $SPARK_SUBMIT_JAVA_OPTIONS"
66
73
$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
43
43
exit 1
44
44
fi
45
45
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
+
46
53
cmd=' $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 "
48
55
--driver-java-options "$GC_OPTS $JAVA_OPTS $LOGGING_OPTS $CONFIG_OVERRIDES"
49
56
$@ $appdir/spark-job-server.jar $conffile'
50
57
You can’t perform that action at this time.
0 commit comments