Revision 7c2e922e lib/cmdlib.py
b/lib/cmdlib.py | ||
---|---|---|
4974 | 4974 |
if msg: |
4975 | 4975 |
lu.LogWarning("Could not shutdown block device %s on node %s: %s", |
4976 | 4976 |
disk.iv_name, node, msg) |
4977 |
if not ignore_primary or node != instance.primary_node: |
|
4977 |
if ((node == instance.primary_node and not ignore_primary) or |
|
4978 |
(node != instance.primary_node and not result.offline)): |
|
4978 | 4979 |
all_result = False |
4979 | 4980 |
return all_result |
4980 | 4981 |
|
... | ... | |
9674 | 9675 |
if self.op.disk_template: |
9675 | 9676 |
r_shut = _ShutdownInstanceDisks(self, instance) |
9676 | 9677 |
if not r_shut: |
9677 |
raise errors.OpExecError("Cannot shutdow instance disks, unable to" |
|
9678 |
raise errors.OpExecError("Cannot shutdown instance disks, unable to"
|
|
9678 | 9679 |
" proceed with disk template conversion") |
9679 | 9680 |
mode = (instance.disk_template, self.op.disk_template) |
9680 | 9681 |
try: |
Also available in: Unified diff