Summary: Disallow shrinking volume type QCOW2 to fail with better message

Marcus Sorensen · Marcus Sorensen · commit 3535f88d16fe · 2013-02-05T12:39:36.000-07:00
Signed-off-by: Marcus Sorensen &lt;marcus@betterservers.com&gt; 1360093176 -0700
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
@@ -1429,6 +1429,8 @@ public Answer execute(ResizeVolumeCommand cmd) {
             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:" 

Original file line number	Diff line number	Diff line change
`@@ -1429,6 +1429,8 @@ public Answer execute(ResizeVolumeCommand cmd) {`
`1429`	`1429`	`if (type == null) {`
`1430`	`1430`	`return new ResizeVolumeAnswer(cmd, false, "Unsupported volume format: pool type '"`
`1431`	`1431`	`+ pool.getType() + "' and volume format '" + vol.getFormat() + "'");`
	`1432`	`+ } else if (type.equals("QCOW2") && shrinkOk) {`
	`1433`	`+ return new ResizeVolumeAnswer(cmd, false, "Unable to shrink volumes of type " + type);`
`1432`	`1434`	`}`
`1433`	`1435`
`1434`	`1436`	`s_logger.debug("got to the stage where we execute the volume resize, params:"`