<fix>[storage]: fix single space storage image cache check #3212
Conversation
Resolves: ZSTAC-81338 Change-Id: I71686f716a66726b6362786c6f78656d65666867 (cherry picked from commit c90da01)
总体概览在 变化详情
代码审查工作量估估🎯 2 (简单) | ⏱️ ~10分钟 诗韵
🚥 Pre-merge checks | ✅ 2 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing touches
📜 Recent review detailsConfiguration used: Path: http://open.zstack.ai:20001/code-reviews/zstack-cloud.yaml (via .coderabbit.yaml) Review profile: CHILL Plan: Pro 📒 Files selected for processing (1)
🧰 Additional context used📓 Path-based instructions (2)**/*.*⚙️ CodeRabbit configuration file
Files:
**/*.java⚙️ CodeRabbit configuration file
Files:
🔍 Remote MCP AtlassianMCPJira Issue Context - ZSTAC-81338Issue Summary: Creating VM from snapshot failed (【星飞MTBF】从快照创建云主机失败) Status: Resolved (P0 - Critical Priority) Key Background Information: Root Cause Analysis:
Solution:
Related Information:
Key Insight: This PR is a cherry-pick of the fix that maintains backward compatibility by allowing single-space storage systems to bypass image downloads when multi-space is not supported, fixing a regression introduced in version 5.5.0. ✏️ Tip: You can disable this entire section by setting Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 0
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
storage/src/main/java/org/zstack/storage/addon/primary/ExternalPrimaryStorage.java (1)
1217-1226: 优先选择 ready 且匹配 allocatedUrl 的缓存，避免返回无效缓存当前在单空间直接返回
caches.get(0)，但caches未过滤state且无排序，可能返回非 ready/已失效或不符合allocatedUrl的缓存，导致后续失败或路径不匹配。建议先筛选ready，并在allocatedUrl提供时优先匹配。🔧 建议修改
- List<ImageCacheVO> caches = Q.New(ImageCacheVO.class) - .eq(ImageCacheVO_.primaryStorageUuid, self.getUuid()) - .eq(ImageCacheVO_.imageUuid, image.getUuid()) - .list(); - - if (!controller.reportCapabilities().isSupportMultiSpace() && !caches.isEmpty()) { - // TODO check exists in ps - completion.success(caches.get(0).toInventory()); - return; - } + List<ImageCacheVO> caches = Q.New(ImageCacheVO.class) + .eq(ImageCacheVO_.primaryStorageUuid, self.getUuid()) + .eq(ImageCacheVO_.imageUuid, image.getUuid()) + .eq(ImageCacheVO_.state, ImageCacheState.ready) + .list(); + + if (!controller.reportCapabilities().isSupportMultiSpace() && !caches.isEmpty()) { + // TODO check exists in ps + ImageCacheVO selected = caches.get(0); + if (allocatedUrl != null) { + for (ImageCacheVO cache : caches) { + ImageCacheInventory inv = cache.toInventory(); + if (ImageCacheUtil.getImageCachePath(inv).startsWith(allocatedUrl)) { + selected = cache; + break; + } + } + } + completion.success(selected.toInventory()); + return; + }
📜 Review details
Configuration used: Path: http://open.zstack.ai:20001/code-reviews/zstack-cloud.yaml (via .coderabbit.yaml)
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (1)
storage/src/main/java/org/zstack/storage/addon/primary/ExternalPrimaryStorage.java
🧰 Additional context used
📓 Path-based instructions (2)
**/*.*
⚙️ CodeRabbit configuration file
**/*.*: - 代码里不应当有有中文，包括报错、注释等都应当使用正确的、无拼写错误的英文来写
Files:
storage/src/main/java/org/zstack/storage/addon/primary/ExternalPrimaryStorage.java
**/*.java
⚙️ CodeRabbit configuration file
**/*.java: ## 1. API 设计要求
- API 命名：
- API 名称必须唯一，不能重复。
- API 消息类需要继承
APIMessage；其返回类必须继承APIReply或APIEvent，并在注释中用@RestResponse进行标注。- API 消息上必须添加注解
@RestRequest，并满足如下规范：
path:
- 针对资源使用复数形式。
- 当 path 中引用消息类变量时，使用
{variableName}格式。- HTTP 方法对应：
- 查询操作 →
HttpMethod.GET- 更新操作 →
HttpMethod.PUT- 创建操作 →
HttpMethod.POST- 删除操作 →
HttpMethod.DELETE- API 类需要实现
__example__方法以便生成 API 文档，并确保生成对应的 Groovy API Template 与 API Markdown 文件。
2. 命名与格式规范
类名：
- 使用 UpperCamelCase 风格。
- 特殊情况：
- VO/AO/EO 类型类除外。
- 抽象类采用
Abstract或Base前缀/后缀。- 异常类应以
Exception结尾。- 测试类需要以
Test或Case结尾。方法名、参数名、成员变量和局部变量：
- 使用 lowerCamelCase 风格。
常量命名：
- 全部大写，使用下划线分隔单词。
- 要求表达清楚，避免使用含糊或不准确的名称。
包名：
- 统一使用小写，使用点分隔符，每个部分应是一个具有自然语义的英文单词（参考 Spring 框架的结构）。
命名细节：
- 避免在父子类或同一代码块中出现相同名字的成员或局部变量，防止混淆。
- 命名缩写：
- 不允许使用不必要的缩写，如：
AbsSchedulerJob、condi、Fu等。应使用完整单词提升可读性。
3. 编写自解释代码
意图表达：
- 避免使用布尔型参数造成含义不明确。例如：
- 对于
stopAgent(boolean ignoreError)，建议拆分为不同函数（如stopAgentIgnoreError()），或使用枚举表达操作类型。- 命名应尽量用完整的单词组合表达意图，并在名称中体现数据类型或用途（例如在常量与变量名称中，将类型词放在末尾）。
- 避免使用魔法值（Magic Value）：
直接使用未经定义的数值或字符串（如 if (status == 5)）应替换为枚举或常量。
示例：
// 错误示例：魔法值
if (user.getStatus() == 5) { ... }
// 正确示例：常量或枚举
public static final int STATUS_ACTIVE = 5;
if (user.getStatus() == STATUS_ACTIVE) { ... }
// 或使用枚举
enum UserStatus { ACTIVE, INACTIVE }
注释：
- 代码应尽量做到自解释，对少于两行的说明可以直接写在代码中。
- 对于较长的注释，需要仔细校对并随代码更新，确保内容正确。
- 接口方法不应有多余的修饰符（例如
public），且必须配有有效的 Javadoc 注释。
4. 流程控制和结构优化
if...else 的使用：
- 应尽量减少 if...else 结构的使用，建议：
- 限制嵌套层级最多为两层，且内层不应再出现
else分支。- 尽早返回（Early Return），将条件判断中的处理逻辑提前结束或抽成独立方法。
- 使用 Java Stream 或 Lambda 表达式代替冗长的循环与条件判断。
条件判断：
- if 条件表达不宜过长或过于复杂，必要时可以将条件抽成 boolean 变量描述。
代码块长度：
...
Files:
storage/src/main/java/org/zstack/storage/addon/primary/ExternalPrimaryStorage.java
🔍 Remote MCP AtlassianMCP
Jira Issue Context - ZSTAC-81338
Issue Summary: Creating VM from snapshot failed (【星飞MTBF】从快照创建云主机失败)
Status: Resolved (P0 - Critical Priority)
Key Background Information:
Root Cause Analysis:
-
Trigger: Creating VM from snapshot
-
Introduction Reason:
- ZBS cannot clone across pools
- ZBS now supports multi-space
- When implementing these features, a check was added to verify if resources are in the same location
- However, this check was not made compatible with storage systems that do not support multi-space
- No testing was conducted for this scenario
-
Root Cause: Lack of compatibility between multi-space and single-space storage systems
Solution:
- Retain the original single-space bypass image download logic and open it for storage systems that don't support multi-space
Related Information:
- Problem Start Version: 5.5.0
- Fix Versions: 5.5.1 (original fix), 5.5.6 (cherry-picked in this PR)
- Related Issues: Links to ZSTAC-69317 and cloned by ZSTAC-81364
- Original PR: http://dev.zstack.io:9080/zstackio/zstack/-/merge_requests/9029 (for 5.5.1)
Key Insight: This PR is a cherry-pick of the fix that maintains backward compatibility by allowing single-space storage systems to bypass image downloads when multi-space is not supported, fixing a regression introduced in version 5.5.0.
✏️ Tip: You can disable this entire section by setting review_details to false in your review settings.
Resolves: ZSTAC-81338
Change-Id: I71686f716a66726b6362786c6f78656d65666867
(cherry picked from commit c90da01)
sync from gitlab !9031