(incubator-uniffle) branch master updated: [#1901] [FOLLOWUP] fix(script): Fix docker-compose compatibility issue when running startup script (#1926)

[rickyma]

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 000703c55 [#1901] [FOLLOWUP] fix(script): Fix docker-compose 
compatibility issue when running startup script (#1926)
000703c55 is described below

commit 000703c55f0dd78d069dee685f7f29f7af56716f
Author: maobaolong <baoloong...@tencent.com>
AuthorDate: Thu Jul 18 11:57:38 2024 +0800

    [#1901] [FOLLOWUP] fix(script): Fix docker-compose compatibility issue when 
running startup script (#1926)
    
    ### What changes were proposed in this pull request?
    
    This PR fixes the docker-compose ci workflow failed issue, it was 
introduced by #1901 .
    
    Although #1901 was tested locally, but the docker-compose ci test still 
failed.
    
    The root cause is that the docker image for docker-compose is a tiny simple 
base image, it is different from CentOS, it does not allow the pattern `java "" 
xxx xxx`.
    
    ### Why are the changes needed?
    
    Fix: #1901
    
    ### Does this PR introduce _any_ user-facing change?
    
    No.
    
    ### How was this patch tested?
    - Local test by docker-compose follow the same steps to ci docker steps
    - CI tests
---
 bin/start-coordinator.sh    | 3 ++-
 bin/start-dashboard.sh      | 3 ++-
 bin/start-shuffle-server.sh | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/start-coordinator.sh b/bin/start-coordinator.sh
index a3294eabd..688675cd8 100755
--- a/bin/start-coordinator.sh
+++ b/bin/start-coordinator.sh
@@ -107,7 +107,8 @@ else
   GC_ARGS=$GC_LOG_ARGS_NEW
 fi
 
-$RUNNER ${UNIFFLE_COORDINATOR_JAVA_OPTS:-""} $ARGS $JVM_ARGS $GC_ARGS -cp 
$CLASSPATH $MAIN_CLASS --conf "$COORDINATOR_CONF_FILE" $@ &
+UNIFFLE_COORDINATOR_JAVA_OPTS=${UNIFFLE_COORDINATOR_JAVA_OPTS:-""}
+$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
index b6d8fdbee..757059d86 100755
--- a/bin/start-dashboard.sh
+++ b/bin/start-dashboard.sh
@@ -88,7 +88,8 @@ else
   GC_ARGS=$GC_LOG_ARGS_NEW
 fi
 
-$RUNNER ${UNIFFLE_DASHBOARD_JAVA_OPTS:-""} $ARGS $JVM_ARGS $GC_ARGS -cp 
$CLASSPATH $MAIN_CLASS --conf "$DASHBOARD_CONF_FILE" $@ &
+UNIFFLE_DASHBOARD_JAVA_OPTS=${UNIFFLE_DASHBOARD_JAVA_OPTS:-""}
+$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 d045f3e69..147270e19 100755
--- a/bin/start-shuffle-server.sh
+++ b/bin/start-shuffle-server.sh
@@ -145,7 +145,8 @@ else
   GC_ARGS=$GC_LOG_ARGS_NEW
 fi
 
-$RUNNER ${UNIFFLE_SHUFFLE_SERVER_JAVA_OPTS:-""} $ARGS $JVM_ARGS $GC_ARGS 
$JAVA_LIB_PATH -cp $CLASSPATH $MAIN_CLASS --conf "$SHUFFLE_SERVER_CONF_FILE" $@ 
&
+UNIFFLE_SHUFFLE_SERVER_JAVA_OPTS=${UNIFFLE_SHUFFLE_SERVER_JAVA_OPTS:-""}
+$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}