From 96c8cd3cda6a1073d2f6e9d984fd7e3d377d5edb Mon Sep 17 00:00:00 2001 From: buryan-agent Date: Wed, 21 Oct 2026 13:56:31 +0300 Subject: [PATCH] =?UTF-8?q?[X-04]=20=D0=A3=D1=87=D0=B5=D0=BD=D0=B8=D1=8F:?= =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B0=20=D0=B4?= =?UTF-8?q?=D0=B0=D0=BC=D0=BF=D0=B0=20=D0=BE=D0=B4=D0=BD=D0=BE=D0=B9=20?= =?UTF-8?q?=D0=B1=D0=B0=D0=B7=D1=8B,=200=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8?= =?UTF-8?q?=D1=86=20=D1=81=D1=87=D0=B8=D1=82=D0=B0=D0=B5=D1=82=D1=81=D1=8F?= =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B0=D0=BB=D0=BE=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ops/drill/drill.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/ops/drill/drill.py b/ops/drill/drill.py index 8b79768..62c7128 100644 --- a/ops/drill/drill.py +++ b/ops/drill/drill.py @@ -43,7 +43,17 @@ def check_database(): dumps = sorted(glob.glob(os.path.join(BACKUPS, "**", "*.sql.gz"), recursive=True)) if not dumps: return False, "нет дампов .sql.gz" - src = dumps[-1] + prefs = ("n8n", "authentik", "gitea", "hub") + src = None + for pref in prefs: + for d in reversed(dumps): + if pref in os.path.basename(d).lower(): + src = d + break + if src: + break + if src is None: + src = dumps[-1] scratch = "drill_restore_check" sh(f"{PG} -c \"drop database if exists {scratch}\"") rc, _, err = sh(f"{PG} -c \"create database {scratch}\"") @@ -54,9 +64,11 @@ def check_database(): "\"select count(*) from information_schema.tables " "where table_schema='public'\"") sh(f"{PG} -c \"drop database if exists {scratch}\"") + tables = (out or "0").strip() if rc != 0: return False, f"дамп не развернулся: {src}" - tables = (out or "0").strip() + if tables == "0": + return False, f"{os.path.basename(src)}: 0 таблиц — дамп неполный" return True, f"{os.path.basename(src)}: {tables} таблиц"