This is an automated email from the ASF dual-hosted git repository.
rickyma pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-uniffle.git
The following commit(s) were added to refs/heads/master by this push:
new 7bb40fa36 #1901 feat(script): Support using JVM args to start
coordinator/shuffle-server/dashboard (#1905)
7bb40fa36 is described below
commit 7bb40fa369467b3772a9f5aecc4f813b62ef5be9
Author: maobaolong <baoloong...@tencent.com>
AuthorDate: Thu Jul 18 02:54:29 2024 +0800
#1901 feat(script): Support using JVM args to start
coordinator/shuffle-server/dashboard (#1905)
### What changes were proposed in this pull request?
Support using JVM args for coordinator/shuffle-server/dashboard.
### Why are the changes needed?
Fix: #1901
### Does this PR introduce _any_ user-facing change?
Users can define JVM args within `rss-env.sh`.
like
```
UNIFFLE_DASHBOARD_JAVA_OPTS=" -Dio.netty.leakDetection.level=PARANOID "
UNIFFLE_SHUFFLE_SERVER_JAVA_OPTS="
-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005 "
UNIFFLE_COORDINATOR_JAVA_OPTS=""
```
### How was this patch tested?
mvn package and launch each server process using the startup script.
---
bin/rss-env.sh | 4 ++++
bin/start-coordinator.sh | 2 +-
bin/start-dashboard.sh | 2 +-
bin/start-shuffle-server.sh | 2 +-
bin/stop-dashboard.sh | 0
5 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/bin/rss-env.sh b/bin/rss-env.sh
index 39efd5cba..f67efdcd3 100644
--- a/bin/rss-env.sh
+++ b/bin/rss-env.sh
@@ -33,3 +33,7 @@ XMX_SIZE="80g" # Shuffle Server JVM XMX size
# RSS_IP, IP address Shuffle Server binds to on this node (Default: first
non-loopback ipv4)
# MAX_DIRECT_MEMORY_SIZE Shuffle Server JVM off heap memory size (Default: not
set)
# MALLOC_ARENA_MAX, Set the number of memory arenas for Shuffle Server
(Default: 4)
+
+# UNIFFLE_DASHBOARD_JAVA_OPTS, JVM options for the dashboard
+# UNIFFLE_SHUFFLE_SERVER_JAVA_OPTS, JVM options for the shuffle server
+# UNIFFLE_COORDINATOR_JAVA_OPTS, JVM options for the coordinator
diff --git a/bin/start-coordinator.sh b/bin/start-coordinator.sh
index 0417869db..a3294eabd 100755
--- a/bin/start-coordinator.sh
+++ b/bin/start-coordinator.sh
@@ -107,7 +107,7 @@ else
GC_ARGS=$GC_LOG_ARGS_NEW
fi
-$RUNNER $ARGS $JVM_ARGS $GC_ARGS -cp $CLASSPATH $MAIN_CLASS --conf
"$COORDINATOR_CONF_FILE" $@ &
+$RUNNER ${UNIFFLE_COORDINATOR_JAVA_OPTS:-""} $ARGS $JVM_ARGS $GC_ARGS -cp
$CLASSPATH $MAIN_CLASS --conf "$COORDINATOR_CONF_FILE" $@ &
get_pid_file_name coordinator
echo $! >${RSS_PID_DIR}/${pid_file}
diff --git a/bin/start-dashboard.sh b/bin/start-dashboard.sh
old mode 100644
new mode 100755
index e001b951d..b6d8fdbee
--- a/bin/start-dashboard.sh
+++ b/bin/start-dashboard.sh
@@ -88,7 +88,7 @@ else
GC_ARGS=$GC_LOG_ARGS_NEW
fi
-$RUNNER $ARGS $JVM_ARGS $GC_ARGS -cp $CLASSPATH $MAIN_CLASS --conf
"$DASHBOARD_CONF_FILE" $@ &
+$RUNNER ${UNIFFLE_DASHBOARD_JAVA_OPTS:-""} $ARGS $JVM_ARGS $GC_ARGS -cp
$CLASSPATH $MAIN_CLASS --conf "$DASHBOARD_CONF_FILE" $@ &
get_pid_file_name dashboard
echo $! >${RSS_PID_DIR}/${pid_file}
diff --git a/bin/start-shuffle-server.sh b/bin/start-shuffle-server.sh
index d6186b386..d045f3e69 100755
--- a/bin/start-shuffle-server.sh
+++ b/bin/start-shuffle-server.sh
@@ -145,7 +145,7 @@ else
GC_ARGS=$GC_LOG_ARGS_NEW
fi
-$RUNNER $ARGS $JVM_ARGS $GC_ARGS $JAVA_LIB_PATH -cp $CLASSPATH $MAIN_CLASS
--conf "$SHUFFLE_SERVER_CONF_FILE" $@ &
+$RUNNER ${UNIFFLE_SHUFFLE_SERVER_JAVA_OPTS:-""} $ARGS $JVM_ARGS $GC_ARGS
$JAVA_LIB_PATH -cp $CLASSPATH $MAIN_CLASS --conf "$SHUFFLE_SERVER_CONF_FILE" $@
&
get_pid_file_name shuffle-server
echo $! >${RSS_PID_DIR}/${pid_file}
diff --git a/bin/stop-dashboard.sh b/bin/stop-dashboard.sh
old mode 100644
new mode 100755
