From 4cfb9426947c00620610d9c5957776575ab4980f Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Mon, 12 Jan 2009 12:42:13 +0000
Subject: [PATCH] Fix some errors in instance modify --disk remove
The RpcResult introduction still left some bugs (after multiple patches):
- we don't correctly check the result type
- rename a variable to prevent a conflict
Reviewed-by: imsnah
---
lib/cmdlib.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 6c74eed20..4cad9bd0c 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -5326,9 +5326,9 @@ class LUSetInstanceParams(LogicalUnit):
" an instance")
ins_l = self.rpc.call_instance_list([pnode], [instance.hypervisor])
ins_l = ins_l[pnode]
- if not type(ins_l) is list:
+ if ins_l.failed or not isinstance(ins_l.data, list):
raise errors.OpPrereqError("Can't contact node '%s'" % pnode)
- if instance.name in ins_l:
+ if instance.name in ins_l.data:
raise errors.OpPrereqError("Instance is running, can't remove"
" disks.")
@@ -5366,8 +5366,8 @@ class LUSetInstanceParams(LogicalUnit):
device_idx = len(instance.disks)
for node, disk in device.ComputeNodeTree(instance.primary_node):
self.cfg.SetDiskID(disk, node)
- result = self.rpc.call_blockdev_remove(node, disk)
- if result.failed or not result.data:
+ rpc_result = self.rpc.call_blockdev_remove(node, disk)
+ if rpc_result.failed or not rpc_result.data:
self.proc.LogWarning("Could not remove disk/%d on node %s,"
" continuing anyway", device_idx, node)
result.append(("disk/%d" % device_idx, "remove"))
--
GitLab