Updated Branches: refs/heads/master 481aae1eb -> 5a1c2dad8
CS-15734 KVM Snapshots show incorrect disk usage. Changed the code to show virtual size (allocated size). RB: https://reviews.apache.org/r/6699/ Send-by: [email protected] Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5a1c2dad Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5a1c2dad Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5a1c2dad Branch: refs/heads/master Commit: 5a1c2dad873a4e3e223c3f9e4cb466a07c99a3f3 Parents: 481aae1 Author: Edison Su <[email protected]> Authored: Mon Aug 20 11:22:41 2012 -0700 Committer: Edison Su <[email protected]> Committed: Mon Aug 20 11:22:41 2012 -0700 ---------------------------------------------------------------------- .../kvm/resource/LibvirtComputingResource.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5a1c2dad/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index 0b18eb1..9e2b62b 100755 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -1159,6 +1159,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements long disksize; try { primaryPool = _storagePoolMgr.getStoragePool(pool.getUuid()); + disksize = dskch.getSize(); if (cmd.getTemplateUrl() != null) { @@ -1170,9 +1171,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements return new Answer(cmd, false, " Can't create storage volume on storage pool"); } - disksize = vol.getSize(); } else { - disksize = dskch.getSize(); vol = primaryPool.createPhysicalDisk(UUID.randomUUID() .toString(), dskch.getSize()); }
