From 853c570bad961987ffbff4c3fea482a70d3826f7 Mon Sep 17 00:00:00 2001
From: Helga Velroyen <helgav@google.com>
Date: Thu, 29 Nov 2012 11:06:42 +0100
Subject: [PATCH] Fixing crash when removing disks
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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index e472dac00..3b0999429 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -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
--
GitLab