Skip to content

Commit ff898e7

Browse files
committed
DSP-15163 use dse script to start context in separate jvm
Dse script is used for manager-start-cmd because it is easily reachable by spark jobserver. Original value for manager-start-cmd is ./manager_start.sh which ends in file not found error. Providing full path to config file would introduce unnecessary complexity. Context-per-jvm share logging configuration with spark jobserver instance. However logging dir is different, every context-per-jvm instance have it's own logging directory.
1 parent 0a135ae commit ff898e7

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

bin/manager_start.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ get_abs_script_path
1414
. $appdir/setenv.sh
1515

1616
# Override logging options to provide per-context logging
17-
LOGGING_OPTS="-Dlog4j.configuration=file:$appdir/log4j-server.properties
17+
LOGGING_OPTS="$LOGGING_OPTS_FILE
1818
-DLOG_DIR=$1"
1919

2020
GC_OPTS="-XX:+UseConcMarkSweepGC

bin/setenv.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,10 @@ if [ -z "$LOG_DIR" ]; then
5353
fi
5454
mkdir -p $LOG_DIR
5555

56-
LOGGING_OPTS="-Dlogback.configurationFile=file:$appdir/logback-server.xml
57-
-DLOG_DIR=$LOG_DIR"
56+
# used in server_start and in manager_start
57+
LOGGING_OPTS_FILE="-Dlogback.configurationFile=file:$appdir/logback-server.xml"
58+
59+
LOGGING_OPTS="$LOGGING_OPTS_FILE -DLOG_DIR=$LOG_DIR"
5860

5961
if [ -z "$JMX_PORT" ]; then
6062
JMX_PORT=9999

job-server/config/dse.conf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,8 @@ spark {
5656

5757
# Note that you can use this file to define settings not only for job server,
5858
# but for your Spark jobs as well. Spark job configuration merges with this configuration file as defaults.
59+
60+
61+
deploy {
62+
manager-start-cmd = "dse spark-jobserver context-per-jvm-managed-start"
63+
}

0 commit comments

Comments
 (0)