Revision c6a9dffa lib/cmdlib.py
| b/lib/cmdlib.py | ||
|---|---|---|
| 1539 | 1539 |
_ErrorIf(test, self.EINSTANCEWRONGNODE, instance, |
| 1540 | 1540 |
"instance should not run on node %s", node) |
| 1541 | 1541 |
|
| 1542 |
diskdata = [(nname, disk, idx)
|
|
| 1542 |
diskdata = [(nname, success, status, idx)
|
|
| 1543 | 1543 |
for (nname, disks) in diskstatus.items() |
| 1544 |
for idx, disk in enumerate(disks)]
|
|
| 1544 |
for idx, (success, status) in enumerate(disks)]
|
|
| 1545 | 1545 |
|
| 1546 |
for nname, bdev_status, idx in diskdata: |
|
| 1547 |
_ErrorIf(not bdev_status,
|
|
| 1546 |
for nname, success, bdev_status, idx in diskdata:
|
|
| 1547 |
_ErrorIf(instanceconfig.admin_up and not success,
|
|
| 1548 | 1548 |
self.EINSTANCEFAULTYDISK, instance, |
| 1549 |
"couldn't retrieve status for disk/%s on %s", idx, nname) |
|
| 1550 |
_ErrorIf(bdev_status and bdev_status.ldisk_status == constants.LDS_FAULTY, |
|
| 1549 |
"couldn't retrieve status for disk/%s on %s: %s", |
|
| 1550 |
idx, nname, bdev_status) |
|
| 1551 |
_ErrorIf((instanceconfig.admin_up and success and |
|
| 1552 |
bdev_status.ldisk_status == constants.LDS_FAULTY), |
|
| 1551 | 1553 |
self.EINSTANCEFAULTYDISK, instance, |
| 1552 | 1554 |
"disk/%s on %s is faulty", idx, nname) |
| 1553 | 1555 |
|
Also available in: Unified diff