fix(backup): 整库逻辑备份按库容错,默认跳过 RDS 管理库 rdsadmin
单库 pg_dump 失败(权限/编码/管理库)不再中止整次备份:清掉半个目录、记进 MANIFEST.failed_databases、 轮转照常执行、最后按失败情况给退出码。云主机实跑:33 秒 / 742.6 MiB / 8 库 / 失败 0。
This commit is contained in:
@@ -21,7 +21,7 @@
|
||||
# JOBS 并行度(默认 4)
|
||||
# KEEP_DAILY 保留最近几份每日备份(默认 7)
|
||||
# KEEP_MONTHS 额外保留最近几个自然月各一份(默认 3)
|
||||
# EXCLUDE_DBS 逗号分隔的跳过列表(默认空)
|
||||
# EXCLUDE_DBS 逗号分隔的跳过列表(默认 rdsadmin:RDS 管理库,普通账号导不出来)
|
||||
set -euo pipefail
|
||||
|
||||
# 备份目录契约:由 scripts/backup_layout.sh 写到 /etc/knowledge-governance/backup.env。
|
||||
@@ -39,7 +39,7 @@ KEEP_DAILY="${KEEP_DAILY:-7}"
|
||||
KEEP_MONTHS="${KEEP_MONTHS:-3}"
|
||||
DRY_RUN="${DRY_RUN:-0}"
|
||||
DBS="${DBS:-}"
|
||||
EXCLUDE_DBS="${EXCLUDE_DBS:-}"
|
||||
EXCLUDE_DBS="${EXCLUDE_DBS:-rdsadmin}"
|
||||
STAMP="$(date -u +%Y%m%dT%H%M%SZ)"
|
||||
|
||||
env_value() {
|
||||
@@ -89,6 +89,7 @@ docker run --rm -e PGURL="$PGURL" "$PG_IMAGE" sh -c \
|
||||
[ -s "$TARGET/globals.err" ] || rm -f "$TARGET/globals.err"
|
||||
|
||||
IFS=',' read -r -a DB_ARRAY <<<"$DBS"
|
||||
FAILED_DBS=""
|
||||
for db in "${DB_ARRAY[@]}"; do
|
||||
db="$(printf '%s' "$db" | tr -d ' ')"
|
||||
[ -n "$db" ] || continue
|
||||
@@ -99,17 +100,23 @@ print(f"postgres://{u.quote(user)}:{u.quote(password)}@{host}:{port}/{name}")
|
||||
PY
|
||||
)"
|
||||
echo " - $db ..."
|
||||
docker run --rm -e DB_URL="$DB_URL" -v "$TARGET:/backup" "$PG_IMAGE" sh -c \
|
||||
"pg_dump -Fd -j $JOBS -Z 6 --no-sync -d \"\$DB_URL\" -f /backup/${db}.dir"
|
||||
# pg_dump -Fd 不接受已有目录;目录名冲突说明本次重复执行,直接报错退出
|
||||
if docker run --rm -e DB_URL="$DB_URL" -v "$TARGET:/backup" "$PG_IMAGE" sh -c \
|
||||
"pg_dump -Fd -j $JOBS -Z 6 --no-sync -d \"\$DB_URL\" -f /backup/${db}.dir"; then
|
||||
:
|
||||
else
|
||||
# 一个库失败(权限/编码/管理库)不能把整次备份作废:清掉半个目录并记账
|
||||
echo " 失败,跳过并记账: $db" >&2
|
||||
rm -rf "$TARGET/${db}.dir"
|
||||
FAILED_DBS="${FAILED_DBS}${db} "
|
||||
fi
|
||||
done
|
||||
|
||||
# dump 之后写清单与说明(先写清单,再算哈希,避免把哈希写进自己的输入)
|
||||
DURATION="$(( $(date +%s) - START_SECONDS ))"
|
||||
python3 - "$TARGET" "$STAMP" "$STARTED_AT" "$DURATION" "$DBS" "$PG_IMAGE" "$JOBS" <<'PY'
|
||||
python3 - "$TARGET" "$STAMP" "$STARTED_AT" "$DURATION" "$DBS" "$PG_IMAGE" "$JOBS" "$FAILED_DBS" <<'PY'
|
||||
import hashlib, json, os, pathlib, sys
|
||||
target = pathlib.Path(sys.argv[1]); stamp, started, duration = sys.argv[2], sys.argv[3], int(sys.argv[4])
|
||||
databases, image, jobs = sys.argv[5], sys.argv[6], int(sys.argv[7])
|
||||
databases, image, jobs = sys.argv[5], sys.argv[6], int(sys.argv[7]); failed = sys.argv[8].split()
|
||||
files = []
|
||||
for path in sorted(target.rglob("*")):
|
||||
if path.is_dir() or path.name in ("MANIFEST.json",):
|
||||
@@ -126,6 +133,7 @@ manifest = {
|
||||
"started_at": started,
|
||||
"duration_seconds": duration,
|
||||
"databases": [name for name in databases.split(",") if name],
|
||||
"failed_databases": failed,
|
||||
"format": "pg_dump -Fd (directory, parallel, zlib)",
|
||||
"pg_dump_image": image,
|
||||
"parallel_jobs": jobs,
|
||||
@@ -187,4 +195,8 @@ for path in stamps:
|
||||
print("kept:", len([p for p in stamps if p.name in keep]))
|
||||
PY
|
||||
|
||||
if [ -n "$FAILED_DBS" ]; then
|
||||
echo "done(有失败的库): $TARGET | failed: $FAILED_DBS" >&2
|
||||
exit 1
|
||||
fi
|
||||
echo "done: $TARGET"
|
||||
Reference in New Issue
Block a user