Skip to content

[Mold Diplo] guest-get-fsinfo/NIC/Qemu 버전 조회를 각각 독립 예외처리로 분리해, 일부 실패해도 이미 수집된 VM stats는 계속 반환되도록 수정 #808

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

Merged
jschoiRR merged 4 commits into from
Apr 14, 2026
Merged

[Mold Diplo] guest-get-fsinfo/NIC/Qemu 버전 조회를 각각 독립 예외처리로 분리해, 일부 실패해도 이미 수집된 VM stats는 계속 반환되도록 수정 #808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b36cef0
guest-get-fsinfo/NIC/QGA 버전 조회를 각각 독립 예외처리로 분리해, 일부 실패해도 이미 수집된 VM st…
jschoiRR Apr 14, 2026
d4268ca
root 볼륨이 "allocated 상태" & "가상머신 미연결" 조건이면 삭제버튼이 활성화 될 수 있도록 UI 수정
jschoiRR Apr 14, 2026
1d4668a
ui 빌드 오류 수정
jschoiRR Apr 14, 2026
a1a21cd
Merge branch 'ablecloud-team:ablestack-diplo' into diplo-2026
jschoiRR Apr 14, 2026
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
128 changes: 68 additions & 60 deletions ...rvisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5093,82 +5093,91 @@ public VmStatsEntry getVmStat(final Connect conn, final String vmName) throws Li
String mergeCommand = String.format("virsh qemu-agent-command %s '{\"execute\":\"guest-info\"}'", vmName);
String result = Script.runSimpleBashScript(mergeCommand);

if (result != null) {
qemuAgentVersion = new JsonParser().parse(result).getAsJsonObject().get("return").getAsJsonObject().get("version").getAsString();
metrics.setQemuAgentVersion(qemuAgentVersion);

result = dm.qemuAgentCommand(QemuCommand.buildQemuCommand(QemuCommand.AGENT_NETWORK_GET_INTERFACES, null), 2, 0);
if (result != null && !(result.startsWith("error"))) {
LOGGER.debug(dm.getName() +" >> " + result);
JsonArray arrData = (JsonArray) new JsonParser().parse(result).getAsJsonObject().get("return");
for (JsonElement je : arrData) {
JsonElement nicName = je.getAsJsonObject().get("name") == null ? null : je.getAsJsonObject().get("name");
JsonElement nicAddrs = je.getAsJsonObject().get("ip-addresses") == null ? null : je.getAsJsonObject().get("ip-addresses");
if(nicName == null || "lo".equals(nicName.getAsString())) {
continue;
} else {
if (nicAddrs == null){
if (StringUtils.isNotBlank(result) && !(result.startsWith("error"))) {
try {
qemuAgentVersion = new JsonParser().parse(result).getAsJsonObject().get("return").getAsJsonObject().get("version").getAsString();
metrics.setQemuAgentVersion(qemuAgentVersion);
} catch (Exception e) {
LOGGER.warn("Failed to parse qemu guest-info result for VM [{}], keeping default qemu agent version.", vmName, e);
}

try {
result = dm.qemuAgentCommand(QemuCommand.buildQemuCommand(QemuCommand.AGENT_NETWORK_GET_INTERFACES, null), 2, 0);
if (StringUtils.isNotBlank(result) && !(result.startsWith("error"))) {
LOGGER.debug(dm.getName() + " >> " + result);
JsonArray arrData = (JsonArray) new JsonParser().parse(result).getAsJsonObject().get("return");
for (JsonElement je : arrData) {
JsonElement nicName = je.getAsJsonObject().get("name") == null ? null : je.getAsJsonObject().get("name");
JsonElement nicAddrs = je.getAsJsonObject().get("ip-addresses") == null ? null : je.getAsJsonObject().get("ip-addresses");
if (nicName == null || "lo".equals(nicName.getAsString())) {
continue;
} else {
JsonElement nicMac = je.getAsJsonObject().get("hardware-address") == null ? null : je.getAsJsonObject().get("hardware-address");
if (nicMac == null) {
if (nicAddrs == null) {
continue;
} else {
JsonArray arrData2 = (JsonArray) je.getAsJsonObject().get("ip-addresses");
for (JsonElement je2 : arrData2) {
JsonElement nicAddrIp = je2.getAsJsonObject().get("ip-address") == null ? null : je2.getAsJsonObject().get("ip-address");
JsonElement nicAddrIpType = je2.getAsJsonObject().get("ip-address-type") == null ? null : je2.getAsJsonObject().get("ip-address-type");
if(nicAddrIp == null || nicAddrIpType== null || !"ipv4".equals(nicAddrIpType.getAsString())) {
continue;
} else {
nicAddrMap.put(nicMac.getAsString(), nicAddrIp.getAsString());
JsonElement nicMac = je.getAsJsonObject().get("hardware-address") == null ? null : je.getAsJsonObject().get("hardware-address");
if (nicMac == null) {
continue;
} else {
JsonArray arrData2 = (JsonArray) je.getAsJsonObject().get("ip-addresses");
for (JsonElement je2 : arrData2) {
JsonElement nicAddrIp = je2.getAsJsonObject().get("ip-address") == null ? null : je2.getAsJsonObject().get("ip-address");
JsonElement nicAddrIpType = je2.getAsJsonObject().get("ip-address-type") == null ? null : je2.getAsJsonObject().get("ip-address-type");
if (nicAddrIp == null || nicAddrIpType == null || !"ipv4".equals(nicAddrIpType.getAsString())) {
continue;
} else {
nicAddrMap.put(nicMac.getAsString(), nicAddrIp.getAsString());
}
}
}
}
}
}
metrics.setNicAddrMap(nicAddrMap);
}
metrics.setNicAddrMap(nicAddrMap);
} catch (Exception e) {
LOGGER.warn("Failed to fetch guest network interfaces for VM [{}], continuing without NIC address stats.", vmName, e);
}

result = dm.qemuAgentCommand(QemuCommand.buildQemuCommand(QemuCommand.AGENT_GET_FSINFO, null), 2, 0);
if (result != null && !(result.startsWith("error"))) {
// logger.debug(dm.getName() + " >> " + result);

JsonArray arrData = (JsonArray) new JsonParser().parse(result).getAsJsonObject().get("return");

for (JsonElement je : arrData) {
JsonObject jsonObj = je.getAsJsonObject();
JsonElement diskInfo = jsonObj.get("disk");

if (diskInfo != null && diskInfo.isJsonArray()) {
for (JsonElement diskElement : diskInfo.getAsJsonArray()) {
// Capacity used by disk file system
JsonObject diskObj = diskElement.getAsJsonObject();

JsonElement serialElement = diskObj.get("serial");
JsonElement usedFsBytesElement = jsonObj.get("used-bytes");
if (serialElement == null || serialElement.isJsonNull() || usedFsBytesElement == null || usedFsBytesElement.isJsonNull()) {
continue;
}
try {
result = dm.qemuAgentCommand(QemuCommand.buildQemuCommand(QemuCommand.AGENT_GET_FSINFO, null), 2, 0);
if (StringUtils.isNotBlank(result) && !(result.startsWith("error"))) {
JsonArray arrData = (JsonArray) new JsonParser().parse(result).getAsJsonObject().get("return");

for (JsonElement je : arrData) {
JsonObject jsonObj = je.getAsJsonObject();
JsonElement diskInfo = jsonObj.get("disk");

if (diskInfo != null && diskInfo.isJsonArray()) {
for (JsonElement diskElement : diskInfo.getAsJsonArray()) {
// Capacity used by disk file system
JsonObject diskObj = diskElement.getAsJsonObject();

JsonElement serialElement = diskObj.get("serial");
JsonElement usedFsBytesElement = jsonObj.get("used-bytes");
if (serialElement == null || serialElement.isJsonNull() || usedFsBytesElement == null || usedFsBytesElement.isJsonNull()) {
continue;
}

String serial = diskObj.get("serial").getAsString();
long usedFsBytes = usedFsBytesElement.getAsLong();
if (serial.length() >= 20) {
//serial to half path uuid
String serial_val = serial.substring(serial.length() - 20);
String serial_uuid = serial_val.substring(0, 8) + "-"
+ serial_val.substring(8, 12) + "-"
+ serial_val.substring(12, 16) + "-"
+ serial_val.substring(16, 20);
serial = serial_uuid;
System.out.println(serial);
String serial = diskObj.get("serial").getAsString();
long usedFsBytes = usedFsBytesElement.getAsLong();
if (serial.length() >= 20) {
// serial to half path uuid
String serialVal = serial.substring(serial.length() - 20);
String serialUuid = serialVal.substring(0, 8) + "-"
+ serialVal.substring(8, 12) + "-"
+ serialVal.substring(12, 16) + "-"
+ serialVal.substring(16, 20);
serial = serialUuid;
}
fsUsageMap.put(serial, fsUsageMap.getOrDefault(serial, 0L) + usedFsBytes);
}
fsUsageMap.put(serial, fsUsageMap.getOrDefault(serial, 0L) + usedFsBytes);
}
}
metrics.setFsUsageMap(fsUsageMap);
}
metrics.setFsUsageMap(fsUsageMap);
} catch (Exception e) {
LOGGER.warn("Failed to fetch guest filesystem info for VM [{}], continuing without filesystem usage stats.", vmName, e);
}
}

Expand Down Expand Up @@ -6451,4 +6460,3 @@ public void createRBDSecretKeyFileIfNoExist(String uuid, String localPath, Strin
} catch (IOException e) {}
}
}

7 changes: 5 additions & 2 deletions ui/src/config/section/storage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,9 +304,12 @@ export default {
message: 'message.action.delete.volume',
dataView: true,
show: (record, store) => {
const isDetached = !record.virtualmachineid
const isDetachedAllocatedRoot = record.state === 'Allocated' && record.type === 'ROOT' && isDetached
return ['Expunging', 'Expunged', 'UploadError'].includes(record.state) ||
['Allocated', 'Uploaded'].includes(record.state) && record.type !== 'ROOT' && !record.virtualmachineid ||
(record.state === 'Ready' && record.type !== 'ROOT' && !record.virtualmachineid) ||
['Allocated', 'Uploaded'].includes(record.state) && record.type !== 'ROOT' && isDetached ||
(record.state === 'Ready' && record.type !== 'ROOT' && isDetached) ||
isDetachedAllocatedRoot ||
((['Admin', 'DomainAdmin'].includes(store.userInfo.roletype) || store.features.allowuserexpungerecovervolume) && record.state === 'Destroy')
},
groupAction: true,
Expand Down
Loading