Revision bb3011ad lib/cmdlib/common.py
b/lib/cmdlib/common.py | ||
---|---|---|
581 | 581 |
cpu_count = be_full[constants.BE_VCPUS] |
582 | 582 |
inst_nodes = cfg.GetInstanceNodes(instance) |
583 | 583 |
es_flags = rpc.GetExclusiveStorageForNodes(cfg, inst_nodes) |
584 |
disks = cfg.GetInstanceDisks(instance) |
|
584 | 585 |
if any(es_flags.values()): |
585 | 586 |
# With exclusive storage use the actual spindles |
586 | 587 |
try: |
587 |
spindle_use = sum([disk.spindles for disk in instance.disks])
|
|
588 |
spindle_use = sum([disk.spindles for disk in disks]) |
|
588 | 589 |
except TypeError: |
589 | 590 |
ret.append("Number of spindles not configured for disks of instance %s" |
590 | 591 |
" while exclusive storage is enabled, try running gnt-cluster" |
... | ... | |
593 | 594 |
spindle_use = None |
594 | 595 |
else: |
595 | 596 |
spindle_use = be_full[constants.BE_SPINDLE_USE] |
596 |
disk_count = len(instance.disks)
|
|
597 |
disk_sizes = [disk.size for disk in instance.disks]
|
|
597 |
disk_count = len(disks) |
|
598 |
disk_sizes = [disk.size for disk in disks] |
|
598 | 599 |
nic_count = len(instance.nics) |
599 | 600 |
disk_template = instance.disk_template |
600 | 601 |
|
... | ... | |
1050 | 1051 |
def FindFaultyInstanceDisks(cfg, rpc_runner, instance, node_uuid, prereq): |
1051 | 1052 |
faulty = [] |
1052 | 1053 |
|
1054 |
disks = cfg.GetInstanceDisks(instance) |
|
1053 | 1055 |
result = rpc_runner.call_blockdev_getmirrorstatus( |
1054 |
node_uuid, (instance.disks, instance))
|
|
1056 |
node_uuid, (disks, instance)) |
|
1055 | 1057 |
result.Raise("Failed to get disk status from node %s" % |
1056 | 1058 |
cfg.GetNodeName(node_uuid), |
1057 | 1059 |
prereq=prereq, ecode=errors.ECODE_ENVIRON) |
Also available in: Unified diff