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,6 +55,13 @@ 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
@@ -64,7 +71,7 @@ if [ -z "${SJS_LAUNCHER}" ]; then
64
71
fi
65
72
66
73
cmd=' $SJS_LAUNCHER --class $MAIN --driver-memory $JOBSERVER_MEMORY
67
- --conf "spark.executor.extraJavaOptions=$LOGGING_OPTS "
74
+ --conf "spark.executor.extraJavaOptions=$EXECUTOR_LOGGING_OPTS "
68
75
$SPARK_SUBMIT_OPTIONS
69
76
--driver-java-options "$GC_OPTS $JAVA_OPTS $LOGGING_OPTS $CONFIG_OVERRIDES $SPARK_SUBMIT_JAVA_OPTIONS"
70
77
$JAR_FILE $3 $4 $CONF_FILE'
Original file line number Diff line number Diff line change @@ -47,8 +47,15 @@ if [ -z "${SJS_LAUNCHER}" ]; then
47
47
export SJS_LAUNCHER=" $SPARK_HOME /bin/spark-submit"
48
48
fi
49
49
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
+
50
57
cmd=' $SJS_LAUNCHER --class $MAIN --driver-memory $JOBSERVER_MEMORY
51
- --conf "spark.executor.extraJavaOptions=$LOGGING_OPTS "
58
+ --conf "spark.executor.extraJavaOptions=$EXECUTOR_LOGGING_OPTS "
52
59
--driver-java-options "$GC_OPTS $JAVA_OPTS $LOGGING_OPTS $CONFIG_OVERRIDES"
53
60
$@ $appdir/spark-job-server.jar $conffile'
54
61
You can’t perform that action at this time.
0 commit comments