Skip to content

Commit c844127

Browse files
[chore][deploy] Change JDK path for JDK17
1 parent 8f069aa commit c844127

File tree

8 files changed

+8
-37
lines changed

8 files changed

+8
-37
lines changed

group_vars/all/_shared.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ install_no_passwd_login: true
3636
#-----------------------------------------------------
3737
# 2. Install Java SDK
3838
#-----------------------------------------------------
39-
install_java_sdk: true
39+
install_java_sdk: false
4040
jdk_install_path: /opt
4141
jdk_home: "{{ jdk_install_path }}/jdk"
4242
#-----------------------------------------------------

roles/dingo/templates/import.sh.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
1919
JAR_PATH=$(find $ROOT -name dingo-cli-*.jar)
2020
NET_JAR_PATH=$(find $ROOT -name dingo-net-*.jar)
2121

22-
{{ jdk_home }}/bin/java ${JAVA_OPTS} \
22+
$ROOT/Linux-x64/bin/java ${JAVA_OPTS} \
2323
-Dlogback.configurationFile=file:${ROOT}/conf/logback-import.xml \
2424
-classpath ${JAR_PATH}:${NET_JAR_PATH} \
2525
io.dingodb.cli.source.Import \

roles/dingo/templates/start-coordinator.sh.j2

-29
This file was deleted.

roles/dingo/templates/start-driver.sh.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
1919
JAR_PATH=$(find $ROOT -name driver-server-*.jar)
2020
NET_JAR_PATH=$(find $ROOT -name dingo-net-*.jar)
2121

22-
nohup {{ jdk_home }}/bin/java ${JAVA_OPTS} \
22+
nohup $ROOT/Linux-x64/bin/java ${JAVA_OPTS} \
2323
-Dlogback.configurationFile=file:${ROOT}/conf/logback-driver.xml \
2424
-classpath ${JAR_PATH}:${NET_JAR_PATH} \
2525
io.dingodb.driver.server.Starter \

roles/dingo/templates/start-executor.sh.j2

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ NET_JAR_PATH=$(find $ROOT -name dingo-net-*.jar)
2323
JAVA_OPTS="-Xms8g -Xmx8g -XX:+AlwaysPreTouch -XX:+UseG1GC -XX:+ScavengeBeforeFullGC -XX:+DisableExplicitGC -XX:+HeapDumpOnOutOfMemoryError -XX:MaxDirectMemorySize=4096m -javaagent:{{ dingo_home }}/libs/jmx_prometheus_javaagent-0.17.2.jar={{ jmx_prometheus_javaagent_port }}:{{ dingo_home }}/conf/jmx_config.yaml"
2424
{% if is_license_support %}
2525
LICENSE_JAR_PATH=$(find $ROOT -name license.jar)
26-
nohup {{ jdk_home }}/bin/java ${JAVA_OPTS} \
26+
nohup $ROOT/Linux-x64/bin/java ${JAVA_OPTS} \
2727
-Dlogback.configurationFile=file:${ROOT}/conf/logback-executor.xml \
2828
-classpath ${JAR_PATH}:${NET_JAR_PATH}:${STORE_JAR_PATH}:${LICENSE_JAR_PATH} \
2929
io.dingodb.server.executor.Starter \
3030
--config ${ROOT}/conf/executor.yaml \
3131
> {{ dingo_log_path }}/executor.out &
3232
{% else %}
33-
nohup {{ jdk_home }}/bin/java ${JAVA_OPTS} \
33+
nohup $ROOT/Linux-x64/bin/java ${JAVA_OPTS} \
3434
-Dlogback.configurationFile=file:${ROOT}/conf/logback-executor.xml \
3535
-classpath ${JAR_PATH}:${NET_JAR_PATH}:${STORE_JAR_PATH} \
3636
io.dingodb.server.executor.Starter \

roles/dingo/templates/start-proxy.sh.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ JAR_PATH=$(find $ROOT -name dingo-proxy*.jar)
2222
JAVA_OPTS="-Xms1g -Xmx1g -XX:+AlwaysPreTouch -XX:+UseG1GC -XX:+ScavengeBeforeFullGC -XX:+DisableExplicitGC -XX:+HeapDumpOnOutOfMemoryError"
2323

2424

25-
nohup {{ jdk_home }}/bin/java ${JAVA_OPTS} \
25+
nohup $ROOT/Linux-x64/bin/java ${JAVA_OPTS} \
2626
-Dlogging.config=file:${ROOT}/conf/logback-proxy.xml \
2727
-jar ${JAR_PATH} \
2828
--spring.config.location=${ROOT}/conf/application-proxy.yaml \

roles/dingo/templates/start-web.sh.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ set -x
2020
ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
2121
JAR_PATH=$(find $ROOT -name dingo-web*.jar)
2222

23-
nohup {{ jdk_home }}/bin/java ${JAVA_OPTS} \
23+
nohup $ROOT/Linux-x64/bin/java ${JAVA_OPTS} \
2424
-Dlogging.config=file:${ROOT}/conf/logback-web.xml \
2525
-jar ${JAR_PATH} \
2626
--spring.config.location=${ROOT}/conf/application-web.yaml \

roles/scaling_in_dingo/templates/mysql_init.sh.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ if [ "${DINGODB_MYSQL_INIT}" -ne 0 ]; then
2323
fi
2424

2525
# run Java start mysql_init
26-
{{ jdk_home }}/bin/java -cp $BASE_DIR/build/bin/dingo-mysql-init-0.6.0-SNAPSHOT.jar io.dingodb.mysql.MysqlInit {{ inventory_hostname }}:{{ dingo_store_coordinator_exchange_port }} > mysql_init.log
26+
$BASE_DIR/Linux-x64/bin/java -cp $BASE_DIR/build/bin/dingo-mysql-init-0.6.0-SNAPSHOT.jar io.dingodb.mysql.MysqlInit {{ inventory_hostname }}:{{ dingo_store_coordinator_exchange_port }} > mysql_init.log
2727

2828
# check status
2929
if [ $? -eq 0 ]

0 commit comments

Comments
 (0)