Skip to content

Test yz #3158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ZStack-Robot wants to merge 2 commits into
base: 5.5.0
Choose a base branch
from
Open

Test yz #3158

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0309a83
fix-ZSTAC-80498@@2
qiuqiuqiuyu Dec 30, 2025
3de3a01
test
qiuqiuqiuyu Dec 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion portal/src/main/java/org/zstack/portal/managementnode/ManagementNodeManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,10 +610,18 @@ public void handle(Map data) {
public void handle(ErrorCode errCode, Map data) {
new BootErrorLog().write(errCode.toString());
ret.success = false;

}
}).start();
} finally {
lock.unlock();
try {
lock.unlock();

} catch (Exception e) {
ErrorCode errCode = Platform.inerr(e.getMessage());
new BootErrorLog().write(errCode.toString());
ret.success = false;
Comment on lines +620 to +623
Copy link

@coderabbitai coderabbitai bot Dec 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

注意 getMessage() 可能返回 null

e.getMessage() 可能返回 null，这会导致生成的错误码信息不完整。虽然 Platform.inerr() 内部可能会处理这种情况，但建议在此处添加防御性检查，确保错误信息的完整性。

此外，这段错误处理逻辑与第 611-612 行的 FlowErrorHandler 中的代码模式类似。根据团队对核心逻辑稳定性的重视（参考 learnings），当前的重复是可以接受的，但如果未来有统一错误处理的需求，可以考虑提取公共方法。

🔎 防御性检查建议 
-ErrorCode errCode = Platform.inerr(e.getMessage());
+ErrorCode errCode = Platform.inerr(e.getMessage() != null ? e.getMessage() : "Unknown error during lock unlock");

Based on learnings, 团队倾向于保持核心逻辑的稳定性，因此代码重复在此场景下是可接受的。

}
}

if (!ret.success || !Platform.IS_RUNNING) {
Expand Down