diff --git a/config.sh b/config.sh index 1e38db3f608c6232bfc56609b34e213d23df05f2..cdb8d50773d14cab20abf2e15b990f3dd1cd84c0 100755 --- a/config.sh +++ b/config.sh @@ -22,7 +22,7 @@ BASE_DIR=$( CPU_NUM="$(grep -c 'processor' /proc/cpuinfo)" JOB_NUM="$(($(grep -c 'processor' /proc/cpuinfo) + 1))" YR_FUNCTION_SYSTEM_VERSION="0.0.1" -OUTPUT_DIR=$(realpath "$BASE_DIR"/../output) +OUTPUT_DIR=$(realpath "$BASE_DIR"/output) echo "OUTPUT_DIR: ${OUTPUT_DIR}" USAGE=" diff --git a/scripts/deploy/function_system/install.sh b/scripts/deploy/function_system/install.sh index 698b33a0ca8f8476533585c2e623acd3fefa1a05..7c85915bb7346dc36a83f3b563ae0f93cc2a4fa0 100644 --- a/scripts/deploy/function_system/install.sh +++ b/scripts/deploy/function_system/install.sh @@ -20,7 +20,10 @@ fi FUNCTION_SYSTEM_DIR=$(readlink -m "${FUNCTION_SYSTEM_DEPLOY_DIR}/..") DATA_SYSTEM_DIR=$(readlink -m "${FUNCTION_SYSTEM_DIR}/../data_system") RUNTIME_HOME_DIR=$(readlink -m "${FUNCTION_SYSTEM_DIR}/../runtime") - +if [ -d "${FUNCTION_SYSTEM_DIR}/../pattern/pattern_faas" ]; then + PATTERN_FAAS_HOME_DIR=$(readlink -m "${FUNCTION_SYSTEM_DIR}/../pattern/pattern_faas") + FUNCTION_META_PATH="$PATTERN_FAAS_HOME_DIR/executor-meta" +fi function install_function_proxy() { log_info "start function proxy, proxy_port=${FUNCTION_PROXY_PORT}, grpc_port=${FUNCTION_PROXY_GRPC_PORT}..." local bin=${FUNCTION_SYSTEM_DIR}/bin/function_proxy