From 77a96ed1f77627aa7c528b5b9f822b31ec1868a0 Mon Sep 17 00:00:00 2001
From: Aaron Brady <aaron@iweb.co.uk>
Date: Fri, 14 Aug 2015 12:15:07 +0100
Subject: [PATCH] Default to notify only script to handle non-CLVM/QCOW cases.

Before this commit the call to `getResizeScriptType` would throw
an exception (earlier versions returned `null`, which was fine) -
this caused the RBD case to fail. By changing the default to
notify only we fix the case for any non-CLVM and non-QCOW cases.

This is RBD for now, but this should extend to new storage
types suppored by Libvirt natively in future.
---
 .../resource/wrapper/LibvirtResizeVolumeCommandWrapper.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtResizeVolumeCommandWrapper.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtResizeVolumeCommandWrapper.java
index 167c72aac18..79ed6e4ae2c 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtResizeVolumeCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtResizeVolumeCommandWrapper.java
@@ -69,9 +69,10 @@ public final class LibvirtResizeVolumeCommandWrapper extends CommandWrapper<Resi
 
             final KVMPhysicalDisk vol = pool.getPhysicalDisk(volid);
             final String path = vol.getPath();
-            String type = libvirtComputingResource.getResizeScriptType(pool, vol);
+            String type = notifyOnlyType;
 
             if (pool.getType() != StoragePoolType.RBD) {
+                type = libvirtComputingResource.getResizeScriptType(pool, vol);
                 if (type.equals("QCOW2") && shrinkOk) {
                     return new ResizeVolumeAnswer(command, false, "Unable to shrink volumes of type " + type);
                 }
@@ -99,7 +100,6 @@ public final class LibvirtResizeVolumeCommandWrapper extends CommandWrapper<Resi
                     }
 
                     v.resize(newSize, flags);
-                    type = notifyOnlyType;
                 } catch (final LibvirtException e) {
                     return new ResizeVolumeAnswer(command, false, e.toString());
                 }