CLOUDSTACK-8263: KVM - notify qemu process of resized volume for libvirt-resized storage

Marcus Sorensen · Marcus Sorensen · commit ed8184a5b2cf · 2015-02-17T14:25:55.000-08:00
Change-Id: Iddd8bb068855d3565075d3ecf7c6c0f074d00e1a
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
@@ -1852,6 +1852,7 @@ public Answer execute(ResizeVolumeCommand cmd) {
         String vmInstanceName = cmd.getInstanceName();
         boolean shrinkOk = cmd.getShrinkOk();
         StorageFilerTO spool = cmd.getPool();
+        final String notifyOnlyType = "NOTIFYONLY";
 
         if ( currentSize == newSize) {
             // nothing to do
@@ -1893,21 +1894,25 @@ public Answer execute(ResizeVolumeCommand cmd) {
                     }
 
                     v.resize(newSize, flags);
+                    type = notifyOnlyType;
                 } catch (LibvirtException e) {
                     return new ResizeVolumeAnswer(cmd, false, e.toString());
                 }
-            } else {
-                s_logger.debug("Volume " + path + " is of the type LVM and can not be resized using libvirt. Invoking resize script.");
-                final Script resizecmd = new Script(_resizeVolumePath, _cmdsTimeout, s_logger);
-                resizecmd.add("-s", String.valueOf(newSize));
-                resizecmd.add("-c", String.valueOf(currentSize));
-                resizecmd.add("-p", path);
-                resizecmd.add("-t", type);
-                resizecmd.add("-r", String.valueOf(shrinkOk));
-                resizecmd.add("-v", vmInstanceName);
-                String result = resizecmd.execute();
+            }
+            s_logger.debug("Invoking resize script to handle type " + type);
+            final Script resizecmd = new Script(_resizeVolumePath, _cmdsTimeout, s_logger);
+            resizecmd.add("-s", String.valueOf(newSize));
+            resizecmd.add("-c", String.valueOf(currentSize));
+            resizecmd.add("-p", path);
+            resizecmd.add("-t", type);
+            resizecmd.add("-r", String.valueOf(shrinkOk));
+            resizecmd.add("-v", vmInstanceName);
+            String result = resizecmd.execute();
 
-                if (result != null) {
+            if (result != null) {
+                if(type.equals(notifyOnlyType)) {
+                    return new ResizeVolumeAnswer(cmd, true, "Resize succeeded, but need reboot to notify guest");
+                } else {
                     return new ResizeVolumeAnswer(cmd, false, result);
                 }
             }
diff --git a/scripts/storage/qcow2/resizevolume.sh b/scripts/storage/qcow2/resizevolume.sh
@@ -245,6 +245,9 @@ then
 elif [ "$ptype" == "QCOW2" ]
 then
   resizeqcow2
+elif [ "$ptype" == "NOTIFYONLY" ]
+then
+  notifyqemu
 else
   echo "unsupported type $ptype"
   exit 1;
