You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celeborn.apache.org by zh...@apache.org on 2023/03/17 08:46:02 UTC
[incubator-celeborn] branch main updated: [CELEBORN-439] Fix java version check in start-work (#1359)
This is an automated email from the ASF dual-hosted git repository.
zhouky pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-celeborn.git
The following commit(s) were added to refs/heads/main by this push:
new ae390d961 [CELEBORN-439] Fix java version check in start-work (#1359)
ae390d961 is described below
commit ae390d9615c3475ab7b24bfff17d50a3dfad4440
Author: hongdd <jn...@163.com>
AuthorDate: Fri Mar 17 16:45:57 2023 +0800
[CELEBORN-439] Fix java version check in start-work (#1359)
---
sbin/restart-worker.sh | 2 +-
sbin/start-worker.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sbin/restart-worker.sh b/sbin/restart-worker.sh
index b332509a5..dd5e2d430 100755
--- a/sbin/restart-worker.sh
+++ b/sbin/restart-worker.sh
@@ -33,7 +33,7 @@ if [ "$CELEBORN_WORKER_OFFHEAP_MEMORY" = "" ]; then
fi
export CELEBORN_JAVA_OPTS="-Xmx$CELEBORN_WORKER_MEMORY -XX:MaxDirectMemorySize=$CELEBORN_WORKER_OFFHEAP_MEMORY $CELEBORN_WORKER_JAVA_OPTS"
-JAVA_VERSION=$(java -version 2>&1 | grep " version " | head -1 | awk '{print $3}' | tr -d '"')
+JAVA_VERSION=$(${JAVA} -version 2>&1 | grep " version " | head -1 | awk '{print $3}' | tr -d '"')
if [[ ! "$JAVA_VERSION" == 1.8.* ]]; then
export CELEBORN_JAVA_OPTS="${CELEBORN_JAVA_OPTS} --add-opens java.base/jdk.internal.misc=ALL-UNNAMED --illegal-access=warn -Dio.netty.tryReflectionSetAccessible=true"
fi
diff --git a/sbin/start-worker.sh b/sbin/start-worker.sh
index ac00c2cd5..a4f055e78 100755
--- a/sbin/start-worker.sh
+++ b/sbin/start-worker.sh
@@ -33,7 +33,7 @@ if [ "$CELEBORN_WORKER_OFFHEAP_MEMORY" = "" ]; then
fi
export CELEBORN_JAVA_OPTS="-Xmx$CELEBORN_WORKER_MEMORY -XX:MaxDirectMemorySize=$CELEBORN_WORKER_OFFHEAP_MEMORY $CELEBORN_WORKER_JAVA_OPTS"
-JAVA_VERSION=$(java -version 2>&1 | grep " version " | head -1 | awk '{print $3}' | tr -d '"')
+JAVA_VERSION=$(${JAVA} -version 2>&1 | grep " version " | head -1 | awk '{print $3}' | tr -d '"')
if [[ ! "$JAVA_VERSION" == 1.8.* ]]; then
export CELEBORN_JAVA_OPTS="${CELEBORN_JAVA_OPTS} --add-opens java.base/jdk.internal.misc=ALL-UNNAMED --illegal-access=warn -Dio.netty.tryReflectionSetAccessible=true"
fi