From 85e26909c448c9a52af54d79763a0bc6282634e3 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Tue, 28 Jul 2020 16:17:09 +0530 Subject: [PATCH 1/3] vmware: the virtual size of vmdk is same as first in the chain This fixes issues of virtual size to be twice in case the disk is a linked-clone root disk. The virtual size of root disk (first in chain) must be used. Signed-off-by: Rohit Yadav --- .../com/cloud/hypervisor/vmware/resource/VmwareResource.java | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java index fab6f0ad938e..341e18cdc5d9 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java @@ -3766,7 +3766,6 @@ protected GetVolumeStatsAnswer execute(GetVolumeStatsCommand cmd) { VolumeStatsEntry vse = statEntry.get(chainInfo); if (vse != null) { vse.setPhysicalSize(vse.getPhysicalSize() + physicalsize); - vse.setVirtualSize(vse.getVirtualSize() + virtualsize); } } else { VolumeStatsEntry vse = new VolumeStatsEntry(chainInfo, physicalsize, virtualsize); From b2f8afb20ebc9368022689dd70f12987285b528d Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Tue, 28 Jul 2020 18:07:20 +0530 Subject: [PATCH 2/3] vmware: missing search query param Signed-off-by: Rohit Yadav --- .../main/java/com/cloud/hypervisor/vmware/mo/DatastoreMO.java | 1 + 1 file changed, 1 insertion(+) diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatastoreMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatastoreMO.java index fa0c380eb062..fd9a374bef08 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatastoreMO.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DatastoreMO.java @@ -356,6 +356,7 @@ public long fileDiskSize(String fileFullPath) throws Exception { FileQueryFlags fqf = new FileQueryFlags(); fqf.setFileSize(true); fqf.setFileOwner(true); + fqf.setFileType(true); fqf.setModification(true); searchSpec.setDetails(fqf); searchSpec.setSearchCaseInsensitive(false); From 83ec7e9f57b0123c8077034cc7cc637cfd9222ae Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Thu, 30 Jul 2020 10:25:29 +0530 Subject: [PATCH 3/3] show percentage for volume utilisation --- .../src/main/java/com/cloud/api/query/ViewResponseHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/api/query/ViewResponseHelper.java b/server/src/main/java/com/cloud/api/query/ViewResponseHelper.java index ced81a6e06c4..4baf25cfca3a 100644 --- a/server/src/main/java/com/cloud/api/query/ViewResponseHelper.java +++ b/server/src/main/java/com/cloud/api/query/ViewResponseHelper.java @@ -268,7 +268,7 @@ public static List createHostForMigrationResponse(Enum public static List createVolumeResponse(ResponseView view, VolumeJoinVO... volumes) { Hashtable vrDataList = new Hashtable(); - DecimalFormat df = new DecimalFormat("0.00"); + DecimalFormat df = new DecimalFormat("0.0%"); for (VolumeJoinVO vr : volumes) { VolumeResponse vrData = vrDataList.get(vr.getId()); if (vrData == null) {