Revision 5e4475de
b/lib/cmdlib/cluster.py | ||
---|---|---|
2350 | 2350 |
node_disks = {} |
2351 | 2351 |
node_disks_devonly = {} |
2352 | 2352 |
diskless_instances = set() |
2353 |
nodisk_instances = set() |
|
2353 | 2354 |
diskless = constants.DT_DISKLESS |
2354 | 2355 |
|
2355 | 2356 |
for nname in nodelist: |
... | ... | |
2362 | 2363 |
for disk in instanceinfo[inst].disks] |
2363 | 2364 |
|
2364 | 2365 |
if not disks: |
2366 |
nodisk_instances.update(inst for inst in node_instances |
|
2367 |
if instanceinfo[inst].disk_template != diskless) |
|
2365 | 2368 |
# No need to collect data |
2366 | 2369 |
continue |
2367 | 2370 |
|
... | ... | |
2416 | 2419 |
for inst in diskless_instances: |
2417 | 2420 |
assert inst not in instdisk |
2418 | 2421 |
instdisk[inst] = {} |
2422 |
# ...and disk-full instances that happen to have no disks |
|
2423 |
for inst in nodisk_instances: |
|
2424 |
assert inst not in instdisk |
|
2425 |
instdisk[inst] = {} |
|
2419 | 2426 |
|
2420 | 2427 |
assert compat.all(len(statuses) == len(instanceinfo[inst].disks) and |
2421 | 2428 |
len(nnames) <= len(instanceinfo[inst].all_nodes) and |
Also available in: Unified diff