improve start-computer.sh

apache · Nov 24, 2022 · 67b7f9f · 67b7f9f
1 parent bdf2d8b
commit 67b7f9f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/computer-dist/src/assembly/static/bin/start-computer.sh b/computer-dist/src/assembly/static/bin/start-computer.sh
@@ -20,7 +20,7 @@ BIN_DIR=$(cd "$(dirname "$0")" && pwd -P)
 BASE_DIR=$(cd "${BIN_DIR}/.." && pwd -P)
 LIB_DIR=${BASE_DIR}/lib
 CONF_DIR="${BASE_DIR}/conf"
-ALGORITHM_DIR="${BASE_DIR}/algorithm"
+DEFAULT_ALGORITHM_DIR="${BASE_DIR}/algorithm"
 
 COMPUTER_CONF_PATH="${COMPUTER_CONF_PATH}"
 LOG4J_CONF_PATH="${LOG4J_CONF_PATH}"
@@ -35,8 +35,9 @@ ROLE_WORKER="worker"
 
 usage() {
     echo "Usage:"
-    echo "    start-computer.sh <-c|--conf conf_file_path>"
-    echo "        <-a|--algorithm algorithm_jar_path>"
+    echo "    start-computer.sh"
+    echo "        [-c|--conf conf_file_path>"
+    echo "        [-a|--algorithm algorithm_jar_path>"
     echo "        [-l|--log4 log4_conf_path]"
     echo "        <-d|--drive drive_type(local|k8s|yarn)>"
     echo "        <-r|--role role(master|worker)>"
@@ -159,26 +160,25 @@ echo "DRIVE=${DRIVE}"
 echo "ROLE=${ROLE}"
 echo "************************************"
 
-if [ "${JAR_FILE_PATH}" != "" ]; then
-    echo "COPY JAR ${JAR_FILE_PATH} to ${ALGORITHM_DIR}/"
-    cp -rf ${JAR_FILE_PATH} "${ALGORITHM_DIR}/"
-fi
-
 CP=$(find "${LIB_DIR}" -name "*.jar" | tr "\n" ":")
 
-CP=${CP}:"${ALGORITHM_DIR}/*"
+CP=${CP}:"${DEFAULT_ALGORITHM_DIR}/*"
+
+if [ "${JAR_FILE_PATH}" != "" ]; then
+    CP=${CP}:${JAR_FILE_PATH}
+fi
 
 # Download remote job JAR file.
-if [[ "${JOB_JAR_URI}" == http://* || "${JOB_JAR_URI}" == https://* ]]; then
+if [[ "${REMOTE_JAR_URI}" == http://* || "${REMOTE_JAR_URI}" == https://* ]]; then
     mkdir -p "${BASE_DIR}/job"
-    echo "Downloading job JAR ${JOB_JAR_URI} to ${BASE_DIR}/job/"
-    wget -nv -P "${BASE_DIR}/job/" "${JOB_JAR_URI}"
+    echo "Downloading job JAR ${REMOTE_JAR_URI} to ${BASE_DIR}/job/"
+    wget -nv -P "${BASE_DIR}/job/" "${REMOTE_JAR_URI}"
     JOB_JAR=$(find "${BASE_DIR}/job" -name "*.jar" | tr "\n" ":")
     if [[ "$JOB_JAR" != "" ]]; then
         CP="${JOB_JAR}"$CP
     fi
-elif [[ "${JOB_JAR_URI}" != "" ]]; then
-    echo "Unsupported protocol for ${JOB_JAR_URI}"
+elif [[ "${REMOTE_JAR_URI}" != "" ]]; then
+    echo "Unsupported protocol for ${REMOTE_JAR_URI}"
     exit 1
 fi
 

diff --git a/...c/main/java/com/baidu/hugegraph/computer/k8s/operator/controller/ComputerJobDeployer.java b/...c/main/java/com/baidu/hugegraph/computer/k8s/operator/controller/ComputerJobDeployer.java
@@ -473,7 +473,7 @@ private Container getContainer(String name, String namespace,
         String remoteJarUri = spec.getRemoteJarUri();
         if (StringUtils.isNotBlank(remoteJarUri)) {
             EnvVar jobJarURI = new EnvVarBuilder()
-                    .withName(Constants.ENV_JOB_JAR_URI)
+                    .withName(Constants.ENV_REMOTE_JAR_URI)
                     .withValue(remoteJarUri)
                     .build();
             envVars.add(jobJarURI);

diff --git a/computer-k8s/src/main/java/com/baidu/hugegraph/computer/k8s/Constants.java b/computer-k8s/src/main/java/com/baidu/hugegraph/computer/k8s/Constants.java
@@ -40,7 +40,7 @@ public class Constants {
     public static final String ENV_COMPUTER_CONF_PATH = "COMPUTER_CONF_PATH";
     public static final String ENV_LOG4J_CONF_PATH = "LOG4J_CONF_PATH";
     public static final String ENV_JAR_FILE_PATH = "JAR_FILE_PATH";
-    public static final String ENV_JOB_JAR_URI = "JOB_JAR_URI";
+    public static final String ENV_REMOTE_JAR_URI = "REMOTE_JAR_URI";
     public static final String ENV_JVM_OPTIONS = "JVM_OPTIONS";
     public static final String ENV_CPU_LIMIT = "CPU_LIMIT";
     public static final String ENV_MEMORY_LIMIT = "MEMORY_LIMIT";