From 2e5254f46da931da634ba015add1b63b382b935e Mon Sep 17 00:00:00 2001 From: mayuehit Date: Fri, 28 Nov 2025 15:43:47 +0800 Subject: [PATCH 1/6] fix ci --- deploy/data_system/install.sh | 2 +- deploy/process/config.sh | 4 +-- deploy/process/deploy.sh | 4 +-- deploy/process/health_check.sh | 4 +-- deploy/process/yr_stop.sh | 4 +-- .../llm_on_multiple_machines/env.sh | 2 +- .../accelerate_llm_instance_scaling.md | 2 +- scripts/package/pypi/package.sh | 6 ++-- scripts/package/utils.sh | 2 +- scripts/package_yuanrong.sh | 28 +++++++++---------- tools/download_dependency.sh | 6 ++-- 11 files changed, 31 insertions(+), 33 deletions(-) diff --git a/deploy/data_system/install.sh b/deploy/data_system/install.sh index 64c5fd8b..d3fcc2c1 100644 --- a/deploy/data_system/install.sh +++ b/deploy/data_system/install.sh @@ -17,7 +17,7 @@ set -o pipefail DATA_SYSTEM_DEPLOY_DIR=$(dirname "$(readlink -f "$0")") if [ -n "${BASE_DIR}" ]; then - DATA_SYSTEM_DEPLOY_DIR=${BASE_DIR}/../../data_system/deploy + DATA_SYSTEM_DEPLOY_DIR=${BASE_DIR}/../../datasystem/deploy fi DATA_SYSTEM_DIR=$(readlink -m "${DATA_SYSTEM_DEPLOY_DIR}/..") MAX_PROCESS_EXIT_TIMES=20 diff --git a/deploy/process/config.sh b/deploy/process/config.sh index caf6a131..ac993c20 100644 --- a/deploy/process/config.sh +++ b/deploy/process/config.sh @@ -124,7 +124,7 @@ STATUS_COLLECT_INTERVAL=300 ENABLE_TRACE=false ENABLE_METRICS=true METRICS_CONFIG="" -METRICS_CONFIG_FILE=$(readlink -m '${BASE_DIR}/../../../function_system/config/metrics_config.json') +METRICS_CONFIG_FILE=$(readlink -m '${BASE_DIR}/../../../functionsystem/config/metrics_config.json') RUNTIME_METRICS_CONFIG="" STATE_STORAGE_TYPE="datasystem" PULL_RESOURCE_INTERVAL=1000 @@ -229,7 +229,7 @@ ENABLE_INHERIT_ENV="false" IS_PARTIAL_WATCH_INSTANCES="false" META_STORE_MAX_FLUSH_CONCURRENCY=100 META_STORE_MAX_FLUSH_BATCH_SIZE=50 -readonly JEMALLOC_LIB_PATH=$(readlink -m "${BASE_DIR}/../../function_system/lib/libjemalloc.so") +readonly JEMALLOC_LIB_PATH=$(readlink -m "${BASE_DIR}/../../functionsystem/lib/libjemalloc.so") # Faas-pattern Configuration ENABLE_FAAS_FRONTEND="false" FAAS_FRONTEND_HTTP_PORT=8888 diff --git a/deploy/process/deploy.sh b/deploy/process/deploy.sh index 230c6843..33af9af7 100644 --- a/deploy/process/deploy.sh +++ b/deploy/process/deploy.sh @@ -19,8 +19,8 @@ BASE_DIR=$( cd "$(dirname "$0")" pwd ) -FUNCTION_SYSTEM_PATH=${BASE_DIR}/../../function_system -DATA_SYSTEM_PATH=${BASE_DIR}/../../data_system +FUNCTION_SYSTEM_PATH=${BASE_DIR}/../../functionsystem +DATA_SYSTEM_PATH=${BASE_DIR}/../../datasystem THIRD_PARTY_PATH=${BASE_DIR}/../../third_party ETCDCTL_PATH=${THIRD_PARTY_PATH}/etcd/etcdctl ETCD_LD_PATH=${THIRD_PARTY_PATH}/etcd/lib:${LD_LIBRARY_PATH} diff --git a/deploy/process/health_check.sh b/deploy/process/health_check.sh index 7c2a9a7f..15292b44 100644 --- a/deploy/process/health_check.sh +++ b/deploy/process/health_check.sh @@ -17,8 +17,8 @@ BASE_DIR=$( cd "$(dirname "$0")" pwd ) -FUNCTION_SYSTEM_PATH=${BASE_DIR}/../../function_system -DATA_SYSTEM_PATH=${BASE_DIR}/../../data_system +FUNCTION_SYSTEM_PATH=${BASE_DIR}/../../functionsystem +DATA_SYSTEM_PATH=${BASE_DIR}/../../datasystem THIRD_PARTY_PATH=${BASE_DIR}/../../third_party [[ ! -f "${FUNCTION_SYSTEM_PATH}/deploy/health_check.sh" ]] && echo "${FUNCTION_SYSTEM_PATH}/deploy/health_check.sh is not exist" && exit 1 diff --git a/deploy/process/yr_stop.sh b/deploy/process/yr_stop.sh index defbbe0a..7cca2a03 100644 --- a/deploy/process/yr_stop.sh +++ b/deploy/process/yr_stop.sh @@ -19,8 +19,8 @@ BASE_DIR=$( cd "$(dirname "$0")" pwd ) -FUNCTION_SYSTEM_PATH=$(readlink -m "${BASE_DIR}/../../function_system") -DATA_SYSTEM_PATH=$(readlink -m "${BASE_DIR}/../../data_system") +FUNCTION_SYSTEM_PATH=$(readlink -m "${BASE_DIR}/../../functionsystem") +DATA_SYSTEM_PATH=$(readlink -m "${BASE_DIR}/../../datasystem") THIRD_PARTY_PATH=$(readlink -m "${BASE_DIR}/../../third_party") . "${BASE_DIR}"/utils.sh diff --git a/docs/sample_code/llm_on_multiple_machines/env.sh b/docs/sample_code/llm_on_multiple_machines/env.sh index 66fdd464..1ae58cf2 100644 --- a/docs/sample_code/llm_on_multiple_machines/env.sh +++ b/docs/sample_code/llm_on_multiple_machines/env.sh @@ -34,6 +34,6 @@ export VLLM_USE_V1=1 # 启用 vLLM 的 v1 API 模式 export VLLM_WORKER_MULTIPROC_METHOD=spawn # Python 多进程启动方式为 spawn export vLLM_MODEL_MEMORY_USE_GB=20 # 模型在单卡上执行需要的显存容量，Qwen2.5-7B设置20刚好合适 export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python -export LD_LIBRARY_PATH=/usr/local/python3.11.13/lib/python3.11/site-packages/yr/inner/function_system/lib:$LD_LIBRARY_PATH # 需要找到yr的安装路径，可通过yr version 查看 +export LD_LIBRARY_PATH=/usr/local/python3.11.13/lib/python3.11/site-packages/yr/inner/functionsystem/lib:$LD_LIBRARY_PATH # 需要找到yr的安装路径，可通过yr version 查看 export HCL_OP_EXPANSION_MODE="AIV" export USING_PREFIX_CONNECTOR=1 # 是否开启前缀匹配，当前数据系统patch 默认开启， commitid：648c6a54b1c5896e85f3e136577deceda8551091 diff --git a/docs/use_cases/accelerate_llm_instance_scaling.md b/docs/use_cases/accelerate_llm_instance_scaling.md index cf39f96c..4408682a 100644 --- a/docs/use_cases/accelerate_llm_instance_scaling.md +++ b/docs/use_cases/accelerate_llm_instance_scaling.md @@ -307,7 +307,7 @@ export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python # 替换 YR_INSTALL_PATH 为 openYuanrong 安装路径，可使用 yr version 命令查看 # 例如：/usr/local/Python-3.11.9/lib/python3.11/site-packages/yr/inner -export LD_LIBRARY_PATH=${YR_INSTALL_PATH}/function_system/lib:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=${YR_INSTALL_PATH}/functiosystem/lib:$LD_LIBRARY_PATH export HCL_OP_EXPANSION_MODE="AIV" # 是否启用 openYuanrong 多级缓存前缀匹配能力，值为 1 表示启动 export USING_PREFIX_CONNECTOR=1 diff --git a/scripts/package/pypi/package.sh b/scripts/package/pypi/package.sh index 4f4e41bc..16add9f4 100644 --- a/scripts/package/pypi/package.sh +++ b/scripts/package/pypi/package.sh @@ -57,9 +57,9 @@ function setup_workspace () { rm -rf ${PYPI_BUILD_DIR}/src/yr/inner/alias rm -rf ${PYPI_BUILD_DIR}/src/yr/inner/initcontainer # keep cpp/include directory - rm -rf ${PYPI_BUILD_DIR}/src/yr/inner/data_system/sdk/*.jar - rm -rf ${PYPI_BUILD_DIR}/src/yr/inner/data_system/sdk/*.whl - rm -rf ${PYPI_BUILD_DIR}/src/yr/inner/data_system/sdk/cpp/lib + rm -rf ${PYPI_BUILD_DIR}/src/yr/inner/datasystem/sdk/*.jar + rm -rf ${PYPI_BUILD_DIR}/src/yr/inner/datasystem/sdk/*.whl + rm -rf ${PYPI_BUILD_DIR}/src/yr/inner/datasystem/sdk/cpp/lib fi log_info "copy whl skeleton code to pypi workspace" diff --git a/scripts/package/utils.sh b/scripts/package/utils.sh index 0953b4aa..bef3ca27 100644 --- a/scripts/package/utils.sh +++ b/scripts/package/utils.sh @@ -56,7 +56,7 @@ function make_combined_yuanrong_package() { mkdir -p ${TEMP_BUILD_CACHE_DIR}/prebuild_tools log_info "extract prebuild tools to ${TEMP_BUILD_CACHE_DIR}" - cp -rf ${PREBUILD_BIN_PATH_YUANRONG}/function_system/cli ${TEMP_BUILD_CACHE_DIR}/prebuild_tools/ + cp -rf ${PREBUILD_BIN_PATH_YUANRONG}/functionsystem/cli ${TEMP_BUILD_CACHE_DIR}/prebuild_tools/ mkdir -p ${TEMP_BUILD_CACHE_DIR}/cli tar --strip-components=1 -xf ${TEMP_BUILD_CACHE_DIR}/prebuild_tools/cli/pkg/cli.tar -C ${TEMP_BUILD_CACHE_DIR}/cli diff --git a/scripts/package_yuanrong.sh b/scripts/package_yuanrong.sh index 44c2b6fa..9561c077 100644 --- a/scripts/package_yuanrong.sh +++ b/scripts/package_yuanrong.sh @@ -90,23 +90,21 @@ get_all tar -zxvf yr-runtime-*.tar.gz -C ${OUTPUT_DIR}/openyuanrong tar -zxvf *functionsystem*.tar.gz -C ${OUTPUT_DIR}/openyuanrong -mkdir -p ${OUTPUT_DIR}/openyuanrong/data_system -tar -zxvf *datasystem*.tar.gz -C ${OUTPUT_DIR}/openyuanrong/data_system -mkdir -p ${OUTPUT_DIR}/openyuanrong/data_system/deploy -cp -fr ${BASE_DIR}/../deploy/data_system/* ${OUTPUT_DIR}/openyuanrong/data_system/deploy/ +tar -zxvf *datasystem*.tar.gz -C ${OUTPUT_DIR}/openyuanrong/ +mkdir -p ${OUTPUT_DIR}/openyuanrong/datasystem/deploy +cp -fr ${BASE_DIR}/../deploy/data_system/* ${OUTPUT_DIR}/openyuanrong/datasystem/deploy/ -cp -fr ${BASE_DIR}/../deploy ${OUTPUT_DIR}/openyuanrong -rm -rf ${OUTPUT_DIR}/openyuanrong/deploy/data_system +cp -fr ${BASE_DIR}/../deploy/process ${OUTPUT_DIR}/openyuanrong frontend_filename=$(ls *frontend*.tar.gz) if [ -n "${frontend_filename}" ]; then tar -zxvf ${frontend_filename} -C ${OUTPUT_DIR}/openyuanrong - cp -fr ${OUTPUT_DIR}/openyuanrong/pattern/pattern_faas/init_frontend_args.json ${OUTPUT_DIR}/openyuanrong/function_system/config/ + cp -fr ${OUTPUT_DIR}/openyuanrong/pattern/pattern_faas/init_frontend_args.json ${OUTPUT_DIR}/openyuanrong/functionsystem/config/ fi dashboard_filename=$(ls *dashboard*.tar.gz) if [ -n "${dashboard_filename}" ]; then - tar -zxvf ${dashboard_filename} -C ${OUTPUT_DIR}/openyuanrong/function_system/ + tar -zxvf ${dashboard_filename} -C ${OUTPUT_DIR}/openyuanrong/functionsystem/ fi find . -type d -exec chmod 750 {} \; @@ -120,20 +118,20 @@ if [ -d ${OUTPUT_DIR}/openyuanrong/deploy/process/ ]; then find ${OUTPUT_DIR}/openyuanrong/deploy/process/ -type f -name "*.yaml" -exec chmod 640 {} \; fi -if [ -d ${OUTPUT_DIR}/openyuanrong/data_system/ ]; then - find ${OUTPUT_DIR}/openyuanrong/data_system/ -type f -exec chmod 550 {} \; +if [ -d ${OUTPUT_DIR}/openyuanrong/datasystem/ ]; then + find ${OUTPUT_DIR}/openyuanrong/datasystem/ -type f -exec chmod 550 {} \; fi -mv ${OUTPUT_DIR}/openyuanrong/function_system/third_party ${OUTPUT_DIR}/openyuanrong/ +mv ${OUTPUT_DIR}/openyuanrong/functionsystem/third_party ${OUTPUT_DIR}/openyuanrong/ if [ -d ${OUTPUT_DIR}/openyuanrong/third_party/ ]; then find ${OUTPUT_DIR}/openyuanrong/third_party/ -type f -exec chmod 550 {} \; fi -if [ -d ${OUTPUT_DIR}/openyuanrong/function_system/ ]; then - find ${OUTPUT_DIR}/openyuanrong/function_system/ -type f -exec chmod 550 {} \; +if [ -d ${OUTPUT_DIR}/openyuanrong/functionsystem/ ]; then + find ${OUTPUT_DIR}/openyuanrong/functionsystem/ -type f -exec chmod 550 {} \; fi -if [ -d ${OUTPUT_DIR}/openyuanrong/function_system/config/ ]; then - find ${OUTPUT_DIR}/openyuanrong/function_system/config/ -type f -exec chmod 640 {} \; +if [ -d ${OUTPUT_DIR}/openyuanrong/functionsystem/config/ ]; then + find ${OUTPUT_DIR}/openyuanrong/functionsystem/config/ -type f -exec chmod 640 {} \; fi if [ -d ${OUTPUT_DIR}/openyuanrong/runtime/deploy/process/ ]; then diff --git a/tools/download_dependency.sh b/tools/download_dependency.sh index f44c1e4d..7a072fec 100644 --- a/tools/download_dependency.sh +++ b/tools/download_dependency.sh @@ -85,8 +85,8 @@ function download_metrics() { pushd "${METRICS_OUT_DIR}" wget -O functionsystem.tar.gz ${FUNCTION_SYSTEM_CACHE} tar --no-same-owner -zxf functionsystem.tar.gz - mv function_system/metrics/* . - rm -rf function_system + mv functionsystem/metrics/* . + rm -rf functionsystem popd } @@ -115,7 +115,7 @@ function compile_functionsystem() { bash build.sh cd output tar -xf ${YR_FUNCTIONSYSTEM_BIN_DIR}/output/yr-functionsystem*.tar.gz - cp -r ${YR_FUNCTIONSYSTEM_BIN_DIR}/output/function_system/metrics ${RUNTIME_SRC_DIR}/ + cp -r ${YR_FUNCTIONSYSTEM_BIN_DIR}/output/functionsystem/metrics ${RUNTIME_SRC_DIR}/ cp -f ${YR_FUNCTIONSYSTEM_BIN_DIR}/output/yr-functionsystem*.tar.gz $RUNTIME_OUTPUT_DIR/ } -- Gitee From e818d0cab5f7216c78837a674ee035194d632b01 Mon Sep 17 00:00:00 2001 From: mayuehit Date: Mon, 1 Dec 2025 10:31:31 +0800 Subject: [PATCH 2/6] fix --- tools/download_dependency.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/download_dependency.sh b/tools/download_dependency.sh index 7a072fec..5ed2c42a 100644 --- a/tools/download_dependency.sh +++ b/tools/download_dependency.sh @@ -70,7 +70,7 @@ function download_datasystem() { mkdir -p "${DS_OUT_DIR}" pushd "${DS_OUT_DIR}" wget -O datasystem.tar.gz ${DATA_SYSTEM_CACHE} - tar --no-same-owner -zxf datasystem.tar.gz + tar --no-same-owner -zxf datasystem.tar.gz --strip-components=1 popd } @@ -102,7 +102,7 @@ function compile_datasystem() { ds_filename=$(ls *.tar.gz) tar -xf $ds_filename -C ${YR_DATASYSTEM_BIN_DIR}/output/ mkdir -p ${YR_FUNCTIONSYSTEM_BIN_DIR}/datasystem/output/ - tar -xf $ds_filename -C ${YR_FUNCTIONSYSTEM_BIN_DIR}/datasystem/output/ + tar -xf $ds_filename -C ${YR_FUNCTIONSYSTEM_BIN_DIR}/datasystem/output/ --strip-components=1 cp -f ${ds_filename} $RUNTIME_OUTPUT_DIR/ } -- Gitee From 5ce8903c0ae42185006eae32194b4c4f58ab29eb Mon Sep 17 00:00:00 2001 From: mayuehit Date: Mon, 1 Dec 2025 12:40:28 +0800 Subject: [PATCH 3/6] fix --- deploy/process/config.sh | 2 +- scripts/package_yuanrong.sh | 6 ++++-- tools/download_dependency.sh | 11 ++++------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/deploy/process/config.sh b/deploy/process/config.sh index ac993c20..c75b7534 100644 --- a/deploy/process/config.sh +++ b/deploy/process/config.sh @@ -124,7 +124,7 @@ STATUS_COLLECT_INTERVAL=300 ENABLE_TRACE=false ENABLE_METRICS=true METRICS_CONFIG="" -METRICS_CONFIG_FILE=$(readlink -m '${BASE_DIR}/../../../functionsystem/config/metrics_config.json') +METRICS_CONFIG_FILE=$(readlink -m '${BASE_DIR}/../../../functionsystem/config/metrics/metrics_config.json') RUNTIME_METRICS_CONFIG="" STATE_STORAGE_TYPE="datasystem" PULL_RESOURCE_INTERVAL=1000 diff --git a/scripts/package_yuanrong.sh b/scripts/package_yuanrong.sh index 9561c077..c4b8c911 100644 --- a/scripts/package_yuanrong.sh +++ b/scripts/package_yuanrong.sh @@ -94,7 +94,8 @@ tar -zxvf *datasystem*.tar.gz -C ${OUTPUT_DIR}/openyuanrong/ mkdir -p ${OUTPUT_DIR}/openyuanrong/datasystem/deploy cp -fr ${BASE_DIR}/../deploy/data_system/* ${OUTPUT_DIR}/openyuanrong/datasystem/deploy/ -cp -fr ${BASE_DIR}/../deploy/process ${OUTPUT_DIR}/openyuanrong +cp -fr ${BASE_DIR}/../deploy ${OUTPUT_DIR}/openyuanrong +rm -rf ${OUTPUT_DIR}/openyuanrong/deploy/data_system frontend_filename=$(ls *frontend*.tar.gz) if [ -n "${frontend_filename}" ]; then @@ -122,7 +123,8 @@ if [ -d ${OUTPUT_DIR}/openyuanrong/datasystem/ ]; then find ${OUTPUT_DIR}/openyuanrong/datasystem/ -type f -exec chmod 550 {} \; fi -mv ${OUTPUT_DIR}/openyuanrong/functionsystem/third_party ${OUTPUT_DIR}/openyuanrong/ +mv ${OUTPUT_DIR}/openyuanrong/functionsystem/deploy/third_party ${OUTPUT_DIR}/openyuanrong/ +mv ${OUTPUT_DIR}/openyuanrong/functionsystem/deploy/function_system/* ${OUTPUT_DIR}/openyuanrong/functionsystem/deploy/ if [ -d ${OUTPUT_DIR}/openyuanrong/third_party/ ]; then find ${OUTPUT_DIR}/openyuanrong/third_party/ -type f -exec chmod 550 {} \; fi diff --git a/tools/download_dependency.sh b/tools/download_dependency.sh index 5ed2c42a..33e75324 100644 --- a/tools/download_dependency.sh +++ b/tools/download_dependency.sh @@ -43,7 +43,7 @@ MODULES="runtime" bash -x ${BASE_DIR}/download_opensource.sh -M $MODULES -T $THIRD_PARTY_DIR RUNTIME_THIRD_PARTY_CACHE=${RUNTIME_THIRD_PARTY_CACHE:-"https://build-logs.openeuler.openatom.cn:38080/temp-archived/openeuler/openYuanrong/runtime_deps/"} DATA_SYSTEM_CACHE=${DATA_SYSTEM_CACHE:-"https://build-logs.openeuler.openatom.cn:38080/temp-archived/openeuler/openYuanrong/yr_cache/$(uname -m)/yr-datasystem-v0.6.0.tar.gz"} -FUNCTION_SYSTEM_CACHE=${FUNCTION_SYSTEM_CACHE:-"https://build-logs.openeuler.openatom.cn:38080/temp-archived/openeuler/openYuanrong/yr_cache/$(uname -m)/yr-functionsystem-v0.6.0.tar.gz"} +METRICS_CACHE=${METRICS_CACHE:-"https://build-logs.openeuler.openatom.cn:38080/temp-archived/openeuler/openYuanrong/yr_cache/$(uname -m)/yr-metrics-v0.6.0.tar.gz"} function check_datasystem() { # check whether datasystem exist if [ ! -d "${YR_DATASYSTEM_BIN_DIR}"/output/sdk/cpp/include ]; then @@ -83,10 +83,8 @@ function download_metrics() { METRICS_OUT_DIR="${YR_METRICS_BIN_DIR}/" mkdir -p "${METRICS_OUT_DIR}" pushd "${METRICS_OUT_DIR}" - wget -O functionsystem.tar.gz ${FUNCTION_SYSTEM_CACHE} - tar --no-same-owner -zxf functionsystem.tar.gz - mv functionsystem/metrics/* . - rm -rf functionsystem + wget -O metrics.tar.gz ${METRICS_CACHE} + tar --no-same-owner -zxf metrics.tar.gz popd } @@ -114,8 +112,7 @@ function compile_functionsystem() { cd ${YR_FUNCTIONSYSTEM_BIN_DIR} bash build.sh cd output - tar -xf ${YR_FUNCTIONSYSTEM_BIN_DIR}/output/yr-functionsystem*.tar.gz - cp -r ${YR_FUNCTIONSYSTEM_BIN_DIR}/output/functionsystem/metrics ${RUNTIME_SRC_DIR}/ + tar -xf ${YR_FUNCTIONSYSTEM_BIN_DIR}/output/yr-metrics*.tar.gz -C ${RUNTIME_SRC_DIR}/ cp -f ${YR_FUNCTIONSYSTEM_BIN_DIR}/output/yr-functionsystem*.tar.gz $RUNTIME_OUTPUT_DIR/ } -- Gitee From 17d8358d87281c872ea290ab07029de0afe91ad7 Mon Sep 17 00:00:00 2001 From: mayuehit Date: Mon, 1 Dec 2025 15:36:11 +0800 Subject: [PATCH 4/6] fix --- scripts/package/utils.sh | 8 ++------ scripts/package_yuanrong.sh | 3 +++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/package/utils.sh b/scripts/package/utils.sh index bef3ca27..f094af08 100644 --- a/scripts/package/utils.sh +++ b/scripts/package/utils.sh @@ -54,13 +54,9 @@ function make_combined_yuanrong_package() { cp -rf ${PREBUILD_BIN_PATH_YUANRONG}/* ${COMBINE_OUTPUT_DIR}/ fi - mkdir -p ${TEMP_BUILD_CACHE_DIR}/prebuild_tools log_info "extract prebuild tools to ${TEMP_BUILD_CACHE_DIR}" - cp -rf ${PREBUILD_BIN_PATH_YUANRONG}/functionsystem/cli ${TEMP_BUILD_CACHE_DIR}/prebuild_tools/ - - mkdir -p ${TEMP_BUILD_CACHE_DIR}/cli - tar --strip-components=1 -xf ${TEMP_BUILD_CACHE_DIR}/prebuild_tools/cli/pkg/cli.tar -C ${TEMP_BUILD_CACHE_DIR}/cli - + mkdir -p ${TEMP_BUILD_CACHE_DIR}/cli/bin/ + cp -rf ${PREBUILD_BIN_PATH_YUANRONG}/functionsystem/bin/yr ${TEMP_BUILD_CACHE_DIR}/cli/bin/ log_info "copy prebuild tools to ${COMBINE_OUTPUT_DIR}" cp -rf ${TEMP_BUILD_CACHE_DIR}/cli ${COMBINE_OUTPUT_DIR} diff --git a/scripts/package_yuanrong.sh b/scripts/package_yuanrong.sh index c4b8c911..3e507a75 100644 --- a/scripts/package_yuanrong.sh +++ b/scripts/package_yuanrong.sh @@ -125,6 +125,9 @@ fi mv ${OUTPUT_DIR}/openyuanrong/functionsystem/deploy/third_party ${OUTPUT_DIR}/openyuanrong/ mv ${OUTPUT_DIR}/openyuanrong/functionsystem/deploy/function_system/* ${OUTPUT_DIR}/openyuanrong/functionsystem/deploy/ +rm -rf ${OUTPUT_DIR}/openyuanrong/functionsystem/deploy/function_system/ +mv ${OUTPUT_DIR}/openyuanrong/functionsystem/deploy/vendor/etcd ${OUTPUT_DIR}/openyuanrong/functionsystem/deploy/third_party/ +rm -rf ${OUTPUT_DIR}/openyuanrong/functionsystem/deploy/vendor if [ -d ${OUTPUT_DIR}/openyuanrong/third_party/ ]; then find ${OUTPUT_DIR}/openyuanrong/third_party/ -type f -exec chmod 550 {} \; fi -- Gitee From c5d80912c20ae78a4794f49621aeb3d97e2b039d Mon Sep 17 00:00:00 2001 From: mayuehit Date: Mon, 1 Dec 2025 16:14:33 +0800 Subject: [PATCH 5/6] fix --- tools/download_dependency.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/download_dependency.sh b/tools/download_dependency.sh index 33e75324..4677fe51 100644 --- a/tools/download_dependency.sh +++ b/tools/download_dependency.sh @@ -43,7 +43,7 @@ MODULES="runtime" bash -x ${BASE_DIR}/download_opensource.sh -M $MODULES -T $THIRD_PARTY_DIR RUNTIME_THIRD_PARTY_CACHE=${RUNTIME_THIRD_PARTY_CACHE:-"https://build-logs.openeuler.openatom.cn:38080/temp-archived/openeuler/openYuanrong/runtime_deps/"} DATA_SYSTEM_CACHE=${DATA_SYSTEM_CACHE:-"https://build-logs.openeuler.openatom.cn:38080/temp-archived/openeuler/openYuanrong/yr_cache/$(uname -m)/yr-datasystem-v0.6.0.tar.gz"} -METRICS_CACHE=${METRICS_CACHE:-"https://build-logs.openeuler.openatom.cn:38080/temp-archived/openeuler/openYuanrong/yr_cache/$(uname -m)/yr-metrics-v0.6.0.tar.gz"} +METRICS_CACHE=${METRICS_CACHE:-"https://build-logs.openeuler.openatom.cn:38080/temp-archived/openeuler/openYuanrong/yr_cache/$(uname -m)/metrics.tar.gz"} function check_datasystem() { # check whether datasystem exist if [ ! -d "${YR_DATASYSTEM_BIN_DIR}"/output/sdk/cpp/include ]; then -- Gitee From de3c45d888b4382cecc0776046e8b32fd5c98291 Mon Sep 17 00:00:00 2001 From: mayuehit Date: Mon, 1 Dec 2025 16:16:25 +0800 Subject: [PATCH 6/6] fix --- tools/download_dependency.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/download_dependency.sh b/tools/download_dependency.sh index 4677fe51..4533fd65 100644 --- a/tools/download_dependency.sh +++ b/tools/download_dependency.sh @@ -112,7 +112,7 @@ function compile_functionsystem() { cd ${YR_FUNCTIONSYSTEM_BIN_DIR} bash build.sh cd output - tar -xf ${YR_FUNCTIONSYSTEM_BIN_DIR}/output/yr-metrics*.tar.gz -C ${RUNTIME_SRC_DIR}/ + tar -xf ${YR_FUNCTIONSYSTEM_BIN_DIR}/output/metrics.tar.gz -C ${RUNTIME_SRC_DIR}/ cp -f ${YR_FUNCTIONSYSTEM_BIN_DIR}/output/yr-functionsystem*.tar.gz $RUNTIME_OUTPUT_DIR/ } -- Gitee