From f516edd1090b61c7abef2385ad60511d0ca0b3a0 Mon Sep 17 00:00:00 2001 From: zstack Date: Tue, 19 May 2026 01:02:27 -0700 Subject: [PATCH 1/2] [host]: SystemTagCreator ignoreIfExisting to prevent duplicate reconnect tags --- compute/src/main/java/org/zstack/compute/host/HostBase.java | 1 + 1 file changed, 1 insertion(+) diff --git a/compute/src/main/java/org/zstack/compute/host/HostBase.java b/compute/src/main/java/org/zstack/compute/host/HostBase.java index 919d92631fc..2f105c947e6 100755 --- a/compute/src/main/java/org/zstack/compute/host/HostBase.java +++ b/compute/src/main/java/org/zstack/compute/host/HostBase.java @@ -1099,6 +1099,7 @@ private void updateHostConnectedTime(HostStatus hostStatus) { creator.setTagByTokens(Collections.singletonMap(token, connectedTime)); creator.inherent = false; creator.recreate = false; + creator.ignoreIfExisting = true; creator.create(); return; } From e17a62e1241e573c7652f701fe3b77b1e6bb30ca Mon Sep 17 00:00:00 2001 From: zstack Date: Tue, 19 May 2026 01:02:27 -0700 Subject: [PATCH 2/2] [conf]: update detach timeout error regex to match dynamic timeout values Match \d+ seconds instead of hardcoded 5, so it works with the new 30s timeout. Resolves: ZSTAC-77160 --- conf/errorElaborations/Elaboration.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/errorElaborations/Elaboration.json b/conf/errorElaborations/Elaboration.json index ec236629bbe..c89e48e713d 100644 --- a/conf/errorElaborations/Elaboration.json +++ b/conf/errorElaborations/Elaboration.json @@ -803,7 +803,7 @@ "category": "PS", "code": "1000", "method": "distance", - "regex": "failed to detach data volume[uuid:%s, installPath:%s] from vm[uuid:%s, name:%s] on kvm host[uuid:%s, ip:%s], because unable to detach the volume from the vm;it's still attached after 5 seconds", + "regex": "failed to detach data volume[uuid:%s, installPath:%s] from vm[uuid:%s, name:%s] on kvm host[uuid:%s, ip:%s], because unable to detach the volume from the vm;it's still attached after \\d+ seconds", "message_cn": "由于云主机操作系统限制可能会导致卸载云盘失败，请尝试对云主机关机后再次卸载。", "message_en": "Detaching volume may fail due to limitations of the VM operating system. Please try again after VM shutdown." },