Updated Branches: refs/heads/4.1 35f7ac307 -> 77d65b3e0
Summary: Disallow shrinking volume type QCOW2 to fail with better message Signed-off-by: Marcus Sorensen <[email protected]> 1360093176 -0700 Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/77d65b3e Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/77d65b3e Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/77d65b3e Branch: refs/heads/4.1 Commit: 77d65b3e08522aaed35c0ce20c493f72dd8003ea Parents: 35f7ac3 Author: Marcus Sorensen <[email protected]> Authored: Tue Feb 5 12:39:36 2013 -0700 Committer: Marcus Sorensen <[email protected]> Committed: Tue Feb 5 12:41:20 2013 -0700 ---------------------------------------------------------------------- .../kvm/resource/LibvirtComputingResource.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/77d65b3e/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 b36b4c2..be30766 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 @@ -1429,6 +1429,8 @@ ServerResource { if (type == null) { return new ResizeVolumeAnswer(cmd, false, "Unsupported volume format: pool type '" + pool.getType() + "' and volume format '" + vol.getFormat() + "'"); + } else if (type.equals("QCOW2") && shrinkOk) { + return new ResizeVolumeAnswer(cmd, false, "Unable to shrink volumes of type " + type); } s_logger.debug("got to the stage where we execute the volume resize, params:"
