修复 Server-Provision 按目标状态准备工具包
新增目标机已有 SpacetimeDB 与 otelcol-contrib 时复用本机安装的准备逻辑 补充 Prepare Provision Tools 传入 SPACETIME_ROOT，避免非默认路径检查错目录 新增 Server-Provision 工具准备回归检查脚本，防止已有工具时仍触发下载 更新开发运维文档与 Hermes 共享记忆，沉淀先检查目标机状态再准备文件的约定
This commit is contained in:
kdletters
86
scripts/check-server-provision-tools.sh
Executable file
86
scripts/check-server-provision-tools.sh
Executable file
@@ -0,0 +1,86 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
REPO_ROOT="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
TMP_ROOT="$(mktemp -d)"
|
||||
trap 'rm -rf "${TMP_ROOT}"' EXIT
|
||||
|
||||
WORK_DIR="${TMP_ROOT}/workspace"
|
||||
FAKE_BIN_DIR="${TMP_ROOT}/fake-bin"
|
||||
TARGET_BIN_DIR="${TMP_ROOT}/target-bin"
|
||||
SPACETIME_ROOT_DIR="${TMP_ROOT}/stdb"
|
||||
OUTPUT_LOG="${TMP_ROOT}/prepare.log"
|
||||
|
||||
mkdir -p \
|
||||
"${WORK_DIR}" \
|
||||
"${FAKE_BIN_DIR}" \
|
||||
"${TARGET_BIN_DIR}" \
|
||||
"${SPACETIME_ROOT_DIR}/bin/current"
|
||||
|
||||
cat >"${FAKE_BIN_DIR}/curl" <<'EOF'
|
||||
#!/usr/bin/env bash
|
||||
echo "curl should not be called when target tools are already ready" >&2
|
||||
exit 97
|
||||
EOF
|
||||
cat >"${FAKE_BIN_DIR}/wget" <<'EOF'
|
||||
#!/usr/bin/env bash
|
||||
echo "wget should not be called when target tools are already ready" >&2
|
||||
exit 97
|
||||
EOF
|
||||
chmod +x "${FAKE_BIN_DIR}/curl" "${FAKE_BIN_DIR}/wget"
|
||||
|
||||
cat >"${TARGET_BIN_DIR}/otelcol-contrib" <<'EOF'
|
||||
#!/usr/bin/env bash
|
||||
echo "otelcol-contrib version 0.151.0"
|
||||
EOF
|
||||
chmod +x "${TARGET_BIN_DIR}/otelcol-contrib"
|
||||
|
||||
cat >"${SPACETIME_ROOT_DIR}/bin/current/spacetimedb-cli" <<'EOF'
|
||||
#!/usr/bin/env bash
|
||||
echo "spacetimedb-cli 2.4.1"
|
||||
EOF
|
||||
cat >"${SPACETIME_ROOT_DIR}/bin/current/spacetimedb-standalone" <<'EOF'
|
||||
#!/usr/bin/env bash
|
||||
echo "spacetimedb-standalone 2.4.1"
|
||||
EOF
|
||||
chmod +x \
|
||||
"${SPACETIME_ROOT_DIR}/bin/current/spacetimedb-cli" \
|
||||
"${SPACETIME_ROOT_DIR}/bin/current/spacetimedb-standalone"
|
||||
|
||||
if ! (
|
||||
cd "${WORK_DIR}"
|
||||
PATH="${FAKE_BIN_DIR}:${PATH}" \
|
||||
WORKSPACE="${WORK_DIR}" \
|
||||
PROVISION_TOOLS_DIR="provision-tools" \
|
||||
PROVISION_DOWNLOADS_DIR="downloads" \
|
||||
PROVISION_TOOLS_TMP_PARENT="${WORK_DIR}/.tmp/server-provision-tools" \
|
||||
PROVISION_REQUIRE_LOCAL_DOWNLOADS="true" \
|
||||
OTELCOL_TARGET_BIN="${TARGET_BIN_DIR}/otelcol-contrib" \
|
||||
OTELCOL_VERSION="0.151.0" \
|
||||
SPACETIME_ROOT="${SPACETIME_ROOT_DIR}" \
|
||||
SPACETIME_EXPECTED_VERSION="2.4.1" \
|
||||
"${REPO_ROOT}/scripts/prepare-server-provision-tools.sh" \
|
||||
>"${OUTPUT_LOG}" 2>&1
|
||||
); then
|
||||
echo "[check-server-provision-tools] prepare-server-provision-tools.sh 执行失败。" >&2
|
||||
cat "${OUTPUT_LOG}" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
grep -q "复用目标机已有 otelcol-contrib" "${OUTPUT_LOG}"
|
||||
grep -q "复用目标机已有 SpacetimeDB 安装" "${OUTPUT_LOG}"
|
||||
grep -q "otelcol-contrib 0.151.0 target existing" "${WORK_DIR}/provision-tools/MANIFEST.txt"
|
||||
grep -q "spacetime target existing" "${WORK_DIR}/provision-tools/MANIFEST.txt"
|
||||
|
||||
test -x "${WORK_DIR}/provision-tools/otelcol-contrib"
|
||||
test -x "${WORK_DIR}/provision-tools/spacetime/spacetime"
|
||||
test -x "${WORK_DIR}/provision-tools/spacetime/bin/current/spacetimedb-cli"
|
||||
test -x "${WORK_DIR}/provision-tools/spacetime/bin/current/spacetimedb-standalone"
|
||||
|
||||
if grep -q "下载 " "${OUTPUT_LOG}"; then
|
||||
echo "[check-server-provision-tools] 已有目标机工具时不应进入下载分支。" >&2
|
||||
cat "${OUTPUT_LOG}" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "[check-server-provision-tools] OK"
|
||||
@@ -7,9 +7,12 @@ OTELCOL_VERSION="${OTELCOL_VERSION:-0.151.0}"
|
||||
PREPARE_OTELCOL="${PREPARE_OTELCOL:-${ENABLE_OTELCOL:-true}}"
|
||||
OTELCOL_DOWNLOAD_ROOT="${OTELCOL_DOWNLOAD_ROOT:-https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download}"
|
||||
OTELCOL_ARCHIVE_PATH="${OTELCOL_ARCHIVE_PATH:-}"
|
||||
OTELCOL_TARGET_BIN="${OTELCOL_TARGET_BIN:-/usr/local/bin/otelcol-contrib}"
|
||||
SPACETIME_INSTALLER_URL="${SPACETIME_INSTALLER_URL:-https://install.spacetimedb.com}"
|
||||
SPACETIME_DOWNLOAD_ROOT="${SPACETIME_DOWNLOAD_ROOT:-https://github.com/clockworklabs/SpacetimeDB/releases/download/v2.4.1}"
|
||||
SPACETIME_TARGET_HOST="${SPACETIME_TARGET_HOST:-x86_64-unknown-linux-gnu}"
|
||||
SPACETIME_ROOT="${SPACETIME_ROOT:-/stdb}"
|
||||
SPACETIME_EXPECTED_VERSION="${SPACETIME_EXPECTED_VERSION:-}"
|
||||
SPACETIME_ARCHIVE_PATH="${SPACETIME_ARCHIVE_PATH:-}"
|
||||
SPACETIME_INSTALLER_PATH="${SPACETIME_INSTALLER_PATH:-}"
|
||||
SPACETIME_UPDATE_INSTALLER_PATH="${SPACETIME_UPDATE_INSTALLER_PATH:-}"
|
||||
@@ -65,6 +68,60 @@ download_file() {
|
||||
fi
|
||||
}
|
||||
|
||||
resolve_spacetime_expected_version() {
|
||||
local download_root="${SPACETIME_DOWNLOAD_ROOT%/}"
|
||||
|
||||
if [[ -n "${SPACETIME_EXPECTED_VERSION}" ]]; then
|
||||
printf "%s" "${SPACETIME_EXPECTED_VERSION}"
|
||||
return
|
||||
fi
|
||||
|
||||
if [[ "${download_root}" =~ /v([0-9]+(\.[0-9]+){1,2})$ ]]; then
|
||||
printf "%s" "${BASH_REMATCH[1]}"
|
||||
fi
|
||||
}
|
||||
|
||||
target_otelcol_ready() {
|
||||
local version_output
|
||||
|
||||
echo "[prepare-provision-tools] 检查目标机 otelcol-contrib: ${OTELCOL_TARGET_BIN}"
|
||||
if [[ ! -x "${OTELCOL_TARGET_BIN}" ]]; then
|
||||
echo "[prepare-provision-tools] 目标机 otelcol-contrib 不存在或不可执行，将准备交付文件。"
|
||||
return 1
|
||||
fi
|
||||
|
||||
version_output="$("${OTELCOL_TARGET_BIN}" --version 2>/dev/null || true)"
|
||||
if [[ -n "${OTELCOL_VERSION}" && "${version_output}" != *"${OTELCOL_VERSION}"* ]]; then
|
||||
echo "[prepare-provision-tools] 目标机 otelcol-contrib 版本不匹配，期望 ${OTELCOL_VERSION}，当前: ${version_output:-unknown}"
|
||||
return 1
|
||||
fi
|
||||
|
||||
echo "[prepare-provision-tools] 目标机 otelcol-contrib 已满足要求: ${version_output:-version unknown}"
|
||||
return 0
|
||||
}
|
||||
|
||||
target_spacetime_ready() {
|
||||
local target_cli="${SPACETIME_ROOT}/bin/current/spacetimedb-cli"
|
||||
local target_standalone="${SPACETIME_ROOT}/bin/current/spacetimedb-standalone"
|
||||
local expected_version version_output
|
||||
|
||||
echo "[prepare-provision-tools] 检查目标机 SpacetimeDB: ${SPACETIME_ROOT}/bin/current"
|
||||
if [[ ! -x "${target_cli}" || ! -x "${target_standalone}" ]]; then
|
||||
echo "[prepare-provision-tools] 目标机 SpacetimeDB current 目录不完整，将准备交付文件。"
|
||||
return 1
|
||||
fi
|
||||
|
||||
expected_version="$(resolve_spacetime_expected_version)"
|
||||
version_output="$("${target_cli}" --version 2>/dev/null || true)"
|
||||
if [[ -n "${expected_version}" && "${version_output}" != *"${expected_version}"* ]]; then
|
||||
echo "[prepare-provision-tools] 目标机 SpacetimeDB 版本不匹配，期望 ${expected_version}，当前: ${version_output:-unknown}"
|
||||
return 1
|
||||
fi
|
||||
|
||||
echo "[prepare-provision-tools] 目标机 SpacetimeDB 已满足要求: ${version_output:-version unknown}"
|
||||
return 0
|
||||
}
|
||||
|
||||
validate_relative_dir() {
|
||||
local label="$1"
|
||||
local path="$2"
|
||||
@@ -101,13 +158,21 @@ prepare_otelcol() {
|
||||
|
||||
require_cmd tar
|
||||
|
||||
if target_otelcol_ready; then
|
||||
echo "[prepare-provision-tools] 复用目标机已有 otelcol-contrib: ${OTELCOL_TARGET_BIN}"
|
||||
install -m 0755 "${OTELCOL_TARGET_BIN}" "${target}"
|
||||
"${target}" --version >/dev/null
|
||||
OTELCOL_SOURCE_DESCRIPTION="target existing ${OTELCOL_TARGET_BIN}"
|
||||
return
|
||||
fi
|
||||
|
||||
if [[ -n "${OTELCOL_ARCHIVE_PATH}" && -f "${OTELCOL_ARCHIVE_PATH}" ]]; then
|
||||
source_archive="${OTELCOL_ARCHIVE_PATH}"
|
||||
elif [[ -n "${PROVISION_DOWNLOADS_DIR}" && -f "${downloaded_archive}" ]]; then
|
||||
source_archive="${downloaded_archive}"
|
||||
fi
|
||||
if [[ "${PROVISION_REQUIRE_LOCAL_DOWNLOADS}" == "true" && -z "${source_archive}" ]]; then
|
||||
echo "[prepare-provision-tools] 要求使用 Windows 已下载的 otelcol-contrib 包，但未找到: ${downloaded_archive}" >&2
|
||||
echo "[prepare-provision-tools] 要求使用本地已有的 otelcol-contrib 来源，但目标机未满足且未找到下载包: ${downloaded_archive}" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@@ -146,6 +211,17 @@ prepare_spacetime() {
|
||||
local downloaded_installer="${PROVISION_DOWNLOADS_DIR}/spacetime-install.sh"
|
||||
local source_installer=""
|
||||
|
||||
if target_spacetime_ready; then
|
||||
echo "[prepare-provision-tools] 复用目标机已有 SpacetimeDB 安装: ${SPACETIME_ROOT}/bin/current"
|
||||
mkdir -p "${target_dir}"
|
||||
cp -a "${SPACETIME_ROOT}/bin" "${target_dir}/bin"
|
||||
chmod 0755 "${target_dir}/bin/current/spacetimedb-cli" "${target_dir}/bin/current/spacetimedb-standalone"
|
||||
make_spacetime_wrapper "${target_dir}/spacetime"
|
||||
"${target_dir}/spacetime" --version >/dev/null
|
||||
SPACETIME_SOURCE_DESCRIPTION="target existing ${SPACETIME_ROOT}/bin/current"
|
||||
return
|
||||
fi
|
||||
|
||||
mkdir -p "${install_root}"
|
||||
if [[ -n "${SPACETIME_ARCHIVE_PATH}" && -f "${SPACETIME_ARCHIVE_PATH}" ]]; then
|
||||
source_archive="${SPACETIME_ARCHIVE_PATH}"
|
||||
@@ -165,7 +241,7 @@ prepare_spacetime() {
|
||||
source_update="${downloaded_update}"
|
||||
fi
|
||||
if [[ "${PROVISION_REQUIRE_LOCAL_DOWNLOADS}" == "true" && -z "${source_archive}" ]]; then
|
||||
echo "[prepare-provision-tools] 要求使用 Windows 已下载的 SpacetimeDB release tarball，但未找到: ${downloaded_archive}" >&2
|
||||
echo "[prepare-provision-tools] 要求使用本地已有的 SpacetimeDB release tarball，但目标机未满足且未找到下载包: ${downloaded_archive}" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@@ -185,7 +261,7 @@ prepare_spacetime() {
|
||||
fi
|
||||
|
||||
if [[ "${PROVISION_REQUIRE_LOCAL_DOWNLOADS}" == "true" && -z "${source_installer}" ]]; then
|
||||
echo "[prepare-provision-tools] 要求使用 Windows 已下载的 SpacetimeDB 官方安装器脚本，但未找到: ${downloaded_installer}" >&2
|
||||
echo "[prepare-provision-tools] 要求使用本地已有的 SpacetimeDB 官方安装器脚本，但未找到: ${downloaded_installer}" >&2
|
||||
exit 1
|
||||
elif [[ -n "${source_installer}" ]]; then
|
||||
echo "[prepare-provision-tools] 使用已下载的 SpacetimeDB 官方安装器脚本: ${source_installer}"
|
||||
|
||||
Reference in New Issue
Block a user