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 @@ -59,8 +59,15 @@ if [ -n "$JOBSERVER_KEYTAB" ]; then
59
59
SPARK_SUBMIT_OPTIONS=" $SPARK_SUBMIT_OPTIONS --keytab $JOBSERVER_KEYTAB "
60
60
fi
61
61
62
+ if [ " $SEPARATE_EXECUTOR_LOGGING " = " true" ]
63
+ then
64
+ EXECUTOR_SETTING=" "
65
+ else
66
+ EXECUTOR_SETTING=" --conf spark.executor.extraJavaOptions=$LOGGING_OPTS "
67
+ fi
68
+
62
69
cmd=' $SPARK_HOME/bin/spark-submit --class $MAIN --driver-memory $JOBSERVER_MEMORY
63
- --conf "spark.executor.extraJavaOptions=$LOGGING_OPTS"
70
+ $EXECUTOR_SETTING
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
+ EXECUTOR_SETTING=" "
49
+ else
50
+ EXECUTOR_SETTING=" --conf spark.executor.extraJavaOptions=$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
+ $EXECUTOR_SETTING
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