两处实测出来的缺陷: - --restore 也走完整前置体检,而体检里"不许已经带注入"这一条会把它自己锁死 (上一轮没收尾时它就永远跑不了)。restore 只校验 docker/worker/归档根。 - 注入用的 overlay 被 compose 记进容器的 config_files 标签,restore 时原样重放 等于把注入又加回去(实测 KG_TEST_BARRIER_DIR 撤不掉)。按文件名排除演练 overlay。 另外演练中断(not_run/接管失败)时明确提示"屏障仍在注入,先 --restore", 不让父以为栈已经干净。
This commit is contained in:
@@ -97,6 +97,7 @@ WS_BACKUP=""
|
||||
WS_FILE=""
|
||||
KILLED_AT=""
|
||||
STATUS_OVERRIDE=""
|
||||
ARMED=0
|
||||
COMPOSE_ARGS=()
|
||||
|
||||
STAMP="$(date -u +%Y%m%dT%H%M%SZ)"
|
||||
@@ -171,6 +172,9 @@ finish() { # finish <exit code>
|
||||
}
|
||||
JSON
|
||||
log "SUMMARY status=$status exit=$code evidence=$EVIDENCE"
|
||||
if [ "$ARMED" -eq 1 ] && [ "$status" != "DRILL_PASSED" ]; then
|
||||
log "注意:屏障注入仍在 worker 上(本次没有走到撤注入那一步)。请运行:bash $0 --restore"
|
||||
fi
|
||||
if [ "$MODE" = "check" ] && [ "$status" = "READY_FOR_PARENT" ]; then
|
||||
log "READY_FOR_PARENT(只是前置体检通过,不是演练通过)"
|
||||
fi
|
||||
@@ -209,6 +213,13 @@ preflight() {
|
||||
BARRIER_HOST="$ARCHIVE_HOST/barrier"
|
||||
record preflight_archive pass "archive=$ARCHIVE_HOST barrier=$BARRIER_HOST"
|
||||
|
||||
# --restore 只负责把注入撤掉:它必须能在"上一轮没有收尾"(甚至还有作业在飞)时也跑通,
|
||||
# 否则 preflight_not_armed 会把它自己锁死(实测过)。
|
||||
if [ "$MODE" = "restore" ]; then
|
||||
record preflight_done pass "restore 模式:只校验 docker/worker/归档根,不检查在飞作业与维护窗口"
|
||||
return 0
|
||||
fi
|
||||
|
||||
TARGET_INSTANCE="$(worker_env LIBRARY_TARGET_INSTANCE)"
|
||||
TARGET_PROJECT="$(worker_env LIBRARY_TARGET_PROJECT)"
|
||||
TARGET_INGRESS_SERVICE="$(worker_env LIBRARY_TARGET_INGRESS_SERVICE)"
|
||||
@@ -279,7 +290,12 @@ compose_argv() { # <override or "">
|
||||
COMPOSE_ARGS=(-p "$COMPOSE_PROJECT")
|
||||
[ -n "$project_dir" ] && COMPOSE_ARGS+=(--project-directory "$project_dir")
|
||||
while IFS= read -r file; do
|
||||
[ -n "$file" ] && COMPOSE_ARGS+=(-f "$file")
|
||||
# 注入用的 overlay 会被 compose 记进容器的 config_files 标签;原样重放就等于
|
||||
# 自己把注入又加回去(实测 --restore 撤不掉)。这里按文件名排除演练 overlay。
|
||||
case "$file" in
|
||||
""|*/barrier.override.yaml) continue ;;
|
||||
esac
|
||||
COMPOSE_ARGS+=(-f "$file")
|
||||
done < <(tr ',' '\n' <<<"$cfg")
|
||||
[ -n "$override" ] && COMPOSE_ARGS+=(-f "$override")
|
||||
return 0
|
||||
@@ -321,6 +337,7 @@ arm_barrier() {
|
||||
local armed
|
||||
armed="$(worker_env KG_TEST_BARRIER_DIR)"
|
||||
[ "$armed" = "$ARCHIVE_ROOT_IN_CONTAINER/barrier" ] || die 2 arm_barrier "屏障注入没生效(KG_TEST_BARRIER_DIR=${armed:-空})"
|
||||
ARMED=1
|
||||
record arm_barrier pass "dir=$armed point=$BARRIER_POINT timeout=$BARRIER_TIMEOUT"
|
||||
}
|
||||
|
||||
@@ -333,6 +350,7 @@ restore_barrier() {
|
||||
[ -z "$(worker_env KG_TEST_BARRIER_DIR)" ] || die 7 restore "屏障注入还在(KG_TEST_BARRIER_DIR 非空)"
|
||||
[ "$(container_field "$WORKER_CONTAINER" '{{.Image}}')" = "$WORKER_IMAGE_ID" ] || die 7 restore \
|
||||
"撤销注入后镜像变了:$WORKER_IMAGE_ID -> $(container_field "$WORKER_CONTAINER" '{{.Image}}')"
|
||||
ARMED=0
|
||||
record restore pass "barrier env removed, image unchanged"
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user