<fix>[compute]: validate root volume size with diskoffering

[zstack-robot-1]

Backport ZSTAC-85589 to 4.8.38 (cross-repo @@2)

Cherry-pick of original fix (含配套测试) to 4.8.38. 本 issue 同时涉及 zstack 与 premium 两仓,分支统一命名 bugfix/ZSTAC-85589@@2 以便 DevOps 关联跑 case。

Sibling repo MR: premium MR (see below)

Commits

commit 5776883b3a <fix>[compute]: validate root volume size with diskoffering
 .../src/main/java/org/zstack/compute/vm/VmInstanceManagerImpl.java  | 6 +++++-
 compute/src/main/java/org/zstack/compute/vm/VmQuotaOperator.java    | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

Related: ZSTAC-85589

sync from gitlab !10065

[coderabbitai]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 1788dc25-e86b-4e00-b95e-b4e52df55ad1

📥 Commits

Reviewing files that changed from the base of the PR and between 00abf62 and 5776883.

📒 Files selected for processing (2)

• compute/src/main/java/org/zstack/compute/vm/VmInstanceManagerImpl.java
• compute/src/main/java/org/zstack/compute/vm/VmQuotaOperator.java

---

行动总览

PR调整RootVolumeTemplate镜像在虚拟机配额计算中的容量来源：当指定根磁盘供给时按供给大小统计，未指定时按镜像大小统计。修改在reportQuota()和check()两处实现保持一致。

变更内容

配额计算逻辑调整

层级 / 文件	摘要
RootVolumeTemplate 容量计算分支调整 compute/src/main/java/org/zstack/compute/vm/VmInstanceManagerImpl.java, compute/src/main/java/org/zstack/compute/vm/VmQuotaOperator.java	VOLUME_SIZE配额计算中，RootVolumeTemplate镜像的容量来源由rootDiskOfferingUuid决定：存在时纳入diskOfferingUuids按磁盘供给统计，不存在时才将imgSize累加到allVolumeSizeAsked。

序列图

（无需生成——此变更为内部配额计算逻辑调整，无多组件交互序列）

代码审查工作量估算

🎯 2 (Simple) | ⏱️ ~8 分钟

诗歌

根卷容量问题解决妙，

供给有无分途径，

镜像大小各自计，

配额校验更精准，

兔子欢呼新逻辑！✨

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name	Status	Explanation	Resolution
Docstring Coverage	⚠️ Warning	Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.	Write docstrings for the functions missing them to satisfy the coverage threshold.

✅ Passed checks (4 passed)

Check name	Status	Explanation
Title check	✅ Passed	标题清晰准确地总结了主要变更：修复计算根卷大小时与磁盘配置项的验证逻辑，与变更集内容完全相关。
Description check	✅ Passed	描述明确阐述了这是针对ZSTAC-85589的回溯移植，涉及的两个文件以及预期的测试，与变更集充分相关。
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

📝 Generate docstrings

• Create stacked PR
• Commit on current branch

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch sync/yaohua.wu/bugfix/ZSTAC-85589@@2

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}