commit 781c85fb8cd2e77cb5d551fc2592fd8015840ab7
Merge: d27150a bb2dc35
Author: Michael Hanselmann <[email protected]>
Date: Mon Dec 20 15:18:36 2010 +0100
Merge branch 'stable-2.3' into devel-2.3
* stable-2.3:
Prepare 2.3.1 release
Fix disk status verification in LUClusterVerify
diff --cc lib/cmdlib.py
index 9e4243d,cefc9cb..c974a05
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@@ -1977,15 -1983,13 +1988,18 @@@ class LUVerifyCluster(LogicalUnit)
for ((inst, _), status) in zip(disks, data):
instdisk.setdefault(inst, {}).setdefault(nname, []).append(status)
+ # Add empty entries for diskless instances.
+ for inst in diskless_instances:
+ assert inst not in instdisk
+ instdisk[inst] = {}
+
assert compat.all(len(statuses) == len(instanceinfo[inst].disks) and
- len(nnames) <= len(instanceinfo[inst].all_nodes)
+ len(nnames) <= len(instanceinfo[inst].all_nodes) and
+ compat.all(isinstance(s, (tuple, list)) and
+ len(s) == 2 for s in statuses)
for inst, nnames in instdisk.items()
for nname, statuses in nnames.items())
+ assert set(instdisk) == set(instanceinfo), "instdisk consistency failure"
return instdisk
