Revision 96acbc09 lib/cmdlib.py
b/lib/cmdlib.py | ||
---|---|---|
607 | 607 |
|
608 | 608 |
return env |
609 | 609 |
|
610 |
|
|
610 | 611 |
def _NICListToTuple(lu, nics): |
611 | 612 |
"""Build a list of nic information tuples. |
612 | 613 |
|
... | ... | |
630 | 631 |
hooks_nics.append((ip, mac, mode, link)) |
631 | 632 |
return hooks_nics |
632 | 633 |
|
634 |
|
|
633 | 635 |
def _BuildInstanceHookEnvByObject(lu, instance, override=None): |
634 | 636 |
"""Builds instance related env variables for hooks from an object. |
635 | 637 |
|
... | ... | |
1872 | 1874 |
|
1873 | 1875 |
""" |
1874 | 1876 |
lu.cfg.SetDiskID(dev, node) |
1875 |
if ldisk: |
|
1876 |
idx = 6 |
|
1877 |
else: |
|
1878 |
idx = 5 |
|
1879 | 1877 |
|
1880 | 1878 |
result = True |
1879 |
|
|
1881 | 1880 |
if on_primary or dev.AssembleOnSecondary(): |
1882 | 1881 |
rstats = lu.rpc.call_blockdev_find(node, dev) |
1883 | 1882 |
msg = rstats.fail_msg |
... | ... | |
1888 | 1887 |
lu.LogWarning("Can't find disk on node %s", node) |
1889 | 1888 |
result = False |
1890 | 1889 |
else: |
1891 |
result = result and (not rstats.payload[idx]) |
|
1890 |
if ldisk: |
|
1891 |
result = result and not rstats.payload.ldisk_degraded |
|
1892 |
else: |
|
1893 |
result = result and not rstats.payload.is_degraded |
|
1894 |
|
|
1892 | 1895 |
if dev.children: |
1893 | 1896 |
for child in dev.children: |
1894 | 1897 |
result = result and _CheckDiskConsistency(lu, child, node, on_primary) |
... | ... | |
5885 | 5888 |
raise errors.OpExecError("Can't find DRBD device %s: %s" % |
5886 | 5889 |
(name, msg)) |
5887 | 5890 |
|
5888 |
if result.payload[5]:
|
|
5891 |
if result.payload.is_degraded:
|
|
5889 | 5892 |
raise errors.OpExecError("DRBD device %s is degraded!" % name) |
5890 | 5893 |
|
5891 | 5894 |
def _RemoveOldStorage(self, node_name, iv_names): |
... | ... | |
6302 | 6305 |
dev_pstatus = None |
6303 | 6306 |
else: |
6304 | 6307 |
dev_pstatus.Raise("Can't compute disk status for %s" % instance.name) |
6305 |
dev_pstatus = dev_pstatus.payload |
|
6308 |
dev_pstatus = dev_pstatus.payload.ToLegacyStatus()
|
|
6306 | 6309 |
else: |
6307 | 6310 |
dev_pstatus = None |
6308 | 6311 |
|
... | ... | |
6320 | 6323 |
dev_sstatus = None |
6321 | 6324 |
else: |
6322 | 6325 |
dev_sstatus.Raise("Can't compute disk status for %s" % instance.name) |
6323 |
dev_sstatus = dev_sstatus.payload |
|
6326 |
dev_sstatus = dev_sstatus.payload.ToLegacyStatus()
|
|
6324 | 6327 |
else: |
6325 | 6328 |
dev_sstatus = None |
6326 | 6329 |
|
Also available in: Unified diff