[HWORKS-1755] Build with dashboard

logicalclocks · Dec 6, 2024 · 3631167 · 3631167
1 parent 9a13cb2
commit 3631167
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -31,7 +31,7 @@ pipeline {
                     echo "Building RSS version ${VERSION} on branch ${BUILD_BRANCH}"
                     docker login -u ${NEXUS_CREDS_USR} -p ${NEXUS_CREDS_PSW} $DOCKER_REGISTRY
 
-                    ./build_distribution.sh --spark3-profile spark3 --hadoop-profile hadoop3.2 --without-dashboard
+                    ./build_distribution.sh --spark3-profile spark3 --hadoop-profile hadoop3.2 --without-mr --without-tez --without-spark2
                     cd deploy/kubernetes/docker ||  exit
                     ./build.sh --hadoop-version 3.2.0.15-EE-SNAPSHOT --registry $DOCKER_REGISTRY --nexus-user $NEXUS_CREDS_USR --nexus-password $NEXUS_CREDS_PSW
                     cd ../../..

diff --git a/bin/start-coordinator.sh b/bin/start-coordinator.sh
@@ -112,7 +112,6 @@ else
 fi
 
 COORDINATOR_JAVA_OPTS=${COORDINATOR_JAVA_OPTS:-""}
-(nohup $RUNNER ${COORDINATOR_BASE_JVM_ARGS} ${COORDINATOR_JVM_GC_ARGS} ${JVM_LOG_ARGS} ${COORDINATOR_JAVA_OPTS} -cp ${CLASSPATH} ${MAIN_CLASS} --conf "${COORDINATOR_CONF_FILE}" $@ > ${LOG_OUT_PATH} 2>&1) &
-
+(nohup $RUNNER ${COORDINATOR_BASE_JVM_ARGS} ${COORDINATOR_JVM_GC_ARGS} ${JVM_LOG_ARGS} ${COORDINATOR_JAVA_OPTS} -cp ${CLASSPATH} ${MAIN_CLASS} --conf "${COORDINATOR_CONF_FILE}" $@ 2>&1 | tee -a ${LOG_OUT_PATH}) &
 get_pid_file_name coordinator
 echo $! >${RSS_PID_DIR}/${pid_file}
diff --git a/bin/start-shuffle-server.sh b/bin/start-shuffle-server.sh
@@ -150,7 +150,7 @@ else
 fi
 
 SHUFFLE_SERVER_JAVA_OPTS=${SHUFFLE_SERVER_JAVA_OPTS:-""}
-(nohup $RUNNER ${SHUFFLE_SERVER_BASE_JVM_ARGS} ${SHUFFLE_SERVER_JVM_GC_ARGS} ${JVM_LOG_ARGS} ${JAVA_LIB_PATH} ${SHUFFLE_SERVER_JAVA_OPTS} -cp ${CLASSPATH} ${MAIN_CLASS} --conf "${SHUFFLE_SERVER_CONF_FILE}" $@ > ${LOG_OUT_PATH} 2>&1) &
+(nohup $RUNNER ${SHUFFLE_SERVER_BASE_JVM_ARGS} ${SHUFFLE_SERVER_JVM_GC_ARGS} ${JVM_LOG_ARGS} ${JAVA_LIB_PATH} ${SHUFFLE_SERVER_JAVA_OPTS} -cp ${CLASSPATH} ${MAIN_CLASS} --conf "${SHUFFLE_SERVER_CONF_FILE}" $@ 2>&1 | tee -a ${LOG_OUT_PATH}) &
 
 get_pid_file_name shuffle-server
 echo $! >${RSS_PID_DIR}/${pid_file}
diff --git a/build_branch.txt b/build_branch.txt
@@ -1 +1 @@
-branch-0.9
+branch-0.10
diff --git a/build_distribution.sh b/build_distribution.sh
@@ -39,7 +39,9 @@ function exit_with_usage() {
   echo "|                         [--spark3-profile <spark3 profile id>] [--spark3-mvn <custom maven options>] |"
   echo "|                         [--hadoop-profile <hadoop profile id>] [--without-mr] [--without-tez]        |"
   echo "|                         [--without-spark] [--without-spark2] [--without-spark3] [--without-dashboard]|"
-  echo "|                         [--name <custom name>]                                                       |"
+  echo "|                         [--name <custom name> ]
+
+    |"
   echo "|                         <maven build options>                                                        |"
   echo "+------------------------------------------------------------------------------------------------------+"
   exit 1

diff --git a/deploy/kubernetes/docker/start.sh b/deploy/kubernetes/docker/start.sh
@@ -55,3 +55,8 @@ if [ "$SERVICE_NAME" == "server" ];then
         fi
     done
 fi
+
+if [ "$SERVICE_NAME" == "dashboard" ]; then
+    bash ${basedir}/bin/start-dashboard.sh
+fi
+
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-0.9.1
+0.10.0
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,3 +55,8 @@ if [ "$SERVICE_NAME" == "server" ];then @@
             fi
         done
     fi
+    if [ "$SERVICE_NAME" == "dashboard" ]; then
+        bash ${basedir}/bin/start-dashboard.sh
+    fi