Fixing crash when removing disks
authorHelga Velroyen <helgav@google.com>
Thu, 29 Nov 2012 10:06:42 +0000 (11:06 +0100)
committerHelga Velroyen <helgav@google.com>
Thu, 29 Nov 2012 11:26:50 +0000 (12:26 +0100)
This bug was introduced by my commit "Check ispecs against ipolicy on
instance modify", because I did not filter for the 'add' action. Thus it
would try to read the size parameter also when removing disks.

Signed-off-by: Helga Velroyen <helgav@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>

lib/cmdlib.py

index e472dac..3b09994 100644 (file)
@@ -13288,7 +13288,7 @@ class LUInstanceSetParams(LogicalUnit):
                                  errors.ECODE_STATE)
     disk_sizes = [disk.size for disk in instance.disks]
     disk_sizes.extend(params["size"] for (op, idx, params, private) in
-                      self.diskmod)
+                      self.diskmod if op == constants.DDM_ADD)
     ispec[constants.ISPEC_DISK_COUNT] = len(disk_sizes)
     ispec[constants.ISPEC_DISK_SIZE] = disk_sizes