From 1ea91bd9f3fbdd969d9b4ed2ac64cdec9f7550a5 Mon Sep 17 00:00:00 2001 From: codex Date: Mon, 26 Oct 2026 04:43:00 +0800 Subject: [PATCH] feat(cloud): default backups to automatic consistency --- docs/PORTABLE_VM_BACKUPS.md | 2 +- web/public/cloud/admin-instances.js | 11 ++++++++--- web/resources/views/venix/layout_assets.tpl | 2 +- .../CloudPortableBackupAdminUiContractTest.php | 13 ++++++++++--- web/tests/LegalPagesContractTest.php | 2 +- web/tests/PublicPageLocaleContractTest.php | 2 +- web/tests/SiteBrandContractTest.php | 2 +- 7 files changed, 23 insertions(+), 11 deletions(-) diff --git a/docs/PORTABLE_VM_BACKUPS.md b/docs/PORTABLE_VM_BACKUPS.md index 561888ac..da9dee8a 100644 --- a/docs/PORTABLE_VM_BACKUPS.md +++ b/docs/PORTABLE_VM_BACKUPS.md @@ -7,7 +7,7 @@ ## 备份边界 - 当前只支持一个面板托管、可写、无 backing chain 的 `vda` qcow2 系统盘;额外数据盘、LUN、外部快照链或正在 pivot/mirror 的磁盘会被拒绝。 -- 运行中实例通过 libvirt full push backup 生成完整对象。可用 QEMU Guest Agent 时选择文件系统一致性;否则只能生成崩溃一致性备份。关机实例从稳定的系统卷生成完整副本。 +- 管理员普通云备份默认使用“自动(优先文件系统一致)”。运行中实例通过 libvirt full push backup 生成完整对象:QEMU Guest Agent 可用时执行文件系统冻结,确认 QGA 不可用时自动降级为崩溃一致性;管理员也可显式选择“强制崩溃一致”跳过 QGA。关机实例从稳定的系统卷生成完整副本,但仍按崩溃一致性报告,因为 Agent 无法证明上一次关机经过来宾系统协调。 - S3 长期凭据只在 PHP 控制面解密。Agent 只得到单对象、单方法、最长七天有效的预签名传输能力,不接收 Access Key 或 Secret Key。 - 对象内容是原 qcow2 数据。传输强制 HTTPS,但当前版本不额外执行客户端加密;生产 Bucket 应启用服务端加密、版本控制、最小权限和不完整 multipart 生命周期清理。 - 系统盘内容保持不变,因此来宾系统数据、账户、SSH host key 和应用配置也保持不变。它是从备份创建新实例,不是重装一个空白操作系统。 diff --git a/web/public/cloud/admin-instances.js b/web/public/cloud/admin-instances.js index a72cabe6..20a351d2 100644 --- a/web/public/cloud/admin-instances.js +++ b/web/public/cloud/admin-instances.js @@ -1104,8 +1104,13 @@ function renderBackups(payload, vmId) { const consistencyLabel = el('label', 'col-12 col-lg-4'); consistencyLabel.append(el('span', 'form-label d-block', '一致性模式')); const consistency = el('select', 'form-select'); consistency.name = 'consistency_mode'; - consistency.append(new Option('崩溃一致(默认)', 'crash'), new Option('文件系统一致(需要 QGA)', 'filesystem')); - consistencyLabel.append(consistency); + consistency.append( + new Option('自动(优先文件系统一致)', 'filesystem', true, true), + new Option('强制崩溃一致(不冻结文件系统)', 'crash'), + ); + const consistencyHelp = el('small', 'form-text text-muted', + '自动模式在 QGA 不可用时降级为崩溃一致;备份列表会显示最终实际使用的一致性模式。'); + consistencyLabel.append(consistency, consistencyHelp); const actions = el('div', 'col-12 col-lg-2 d-grid'); const submit = el('button', 'btn btn-primary', '开始备份'); submit.type = 'submit'; actions.append(submit); form.append(nameLabel, consistencyLabel, actions); @@ -1138,7 +1143,7 @@ function renderBackups(payload, vmId) { try { const receipt = await mutate( `/api/v1/admin/instances/${encodeURIComponent(vmId)}/backups`, - { name: backupName, consistency_mode: consistency.value === 'filesystem' ? 'filesystem' : 'crash' }, + { name: backupName, consistency_mode: consistency.value === 'crash' ? 'crash' : 'filesystem' }, controller, 'POST', ); diff --git a/web/resources/views/venix/layout_assets.tpl b/web/resources/views/venix/layout_assets.tpl index 65a85c60..d8709195 100644 --- a/web/resources/views/venix/layout_assets.tpl +++ b/web/resources/views/venix/layout_assets.tpl @@ -1,2 +1,2 @@ {* Shared Venix CSS/JS cache key. Increment whenever a shared browser asset changes. *} -{assign var=venix_asset_version value='2026102506' scope='global'} +{assign var=venix_asset_version value='2026102601' scope='global'} diff --git a/web/tests/CloudPortableBackupAdminUiContractTest.php b/web/tests/CloudPortableBackupAdminUiContractTest.php index bf36799d..84d2882c 100644 --- a/web/tests/CloudPortableBackupAdminUiContractTest.php +++ b/web/tests/CloudPortableBackupAdminUiContractTest.php @@ -93,12 +93,19 @@ $assert(str_contains($template, 'data-instance-tab="backups"') && str_contains($runtime, 'async function loadBackups('), 'Administrator instance detail must expose a lazy portable-backup panel.'); -$assert(str_contains($runtime, "new Option('崩溃一致(默认)', 'crash')") - && str_contains($runtime, "consistency_mode: consistency.value === 'filesystem' ? 'filesystem' : 'crash'") +$assert(str_contains($runtime, + "new Option('自动(优先文件系统一致)', 'filesystem', true, true)") + && str_contains($runtime, + "new Option('强制崩溃一致(不冻结文件系统)', 'crash')") + && str_contains($runtime, '自动模式在 QGA 不可用时降级为崩溃一致') + && str_contains($runtime, '备份列表会显示最终实际使用的一致性模式') + && str_contains($runtime, + "consistency_mode: consistency.value === 'crash' ? 'crash' : 'filesystem'") + && str_contains($service, "'consistency_mode' => 'crash'") && str_contains($runtime, "method = 'PATCH'") && str_contains($runtime, "'POST',") && str_contains($runtime, 'confirm_new_instance: true'), - 'Backup creation and restore must use explicit POST mutations and confirmation.'); + 'Ordinary backup creation must default to automatic filesystem consistency while maintenance migration remains crash-consistent.'); $assert(str_contains($runtime, "method: 'DELETE'") && str_contains($runtime, '核对删除状态') diff --git a/web/tests/LegalPagesContractTest.php b/web/tests/LegalPagesContractTest.php index 7a72aef4..c05c43ea 100644 --- a/web/tests/LegalPagesContractTest.php +++ b/web/tests/LegalPagesContractTest.php @@ -73,7 +73,7 @@ $assert(str_contains($auth, "Config::get('tos_reg') === 'true'") 'Legal consent is only client-side and can be bypassed.'); $assets = $read('web/resources/views/venix/layout_assets.tpl'); -$assert(str_contains($assets, "value='2026102506'") +$assert(str_contains($assets, "value='2026102601'") && str_contains($admin, '?v={$venix_asset_version}') && str_contains($read('web/resources/views/venix/home/layout_header.tpl'), '?v={$venix_asset_version}'), 'Shared browser asset version was not coupled to the new assets.'); diff --git a/web/tests/PublicPageLocaleContractTest.php b/web/tests/PublicPageLocaleContractTest.php index 89bb2af6..724cc77d 100644 --- a/web/tests/PublicPageLocaleContractTest.php +++ b/web/tests/PublicPageLocaleContractTest.php @@ -80,7 +80,7 @@ $assert(preg_match('/\.landing-site-header\s*\{[^}]*position:\s*fixed;/s', $css) && str_contains($accountCss, 'padding-top: 88px;') && str_contains($accountCss, 'padding-top: 76px;'), 'Persistent desktop or mobile public-navigation styling is incomplete.'); -$assert(str_contains($read('web/resources/views/venix/layout_assets.tpl'), "value='2026102506'"), +$assert(str_contains($read('web/resources/views/venix/layout_assets.tpl'), "value='2026102601'"), 'The shared browser asset version was not advanced with the navigation styles.'); echo "Public page locale and shared-layout contract tests passed.\n"; diff --git a/web/tests/SiteBrandContractTest.php b/web/tests/SiteBrandContractTest.php index 3d3c9039..0249d40d 100644 --- a/web/tests/SiteBrandContractTest.php +++ b/web/tests/SiteBrandContractTest.php @@ -69,7 +69,7 @@ foreach ($templates as $template) { } $assets = $read('web/resources/views/venix/layout_assets.tpl'); -$assert(str_contains($assets, "value='2026102506'"), +$assert(str_contains($assets, "value='2026102601'"), 'The shared asset version was not updated for the canonical logo.'); echo "Shared site-brand contract passed across public, auth, user, cloud and admin layouts.\n";