Revision 1122eb25 lib/cmdlib.py
b/lib/cmdlib.py | ||
---|---|---|
1163 | 1163 |
# check that ':' is not present in PV names, since it's a |
1164 | 1164 |
# special character for lvcreate (denotes the range of PEs to |
1165 | 1165 |
# use on the PV) |
1166 |
for size, pvname, owner_vg in pvlist:
|
|
1166 |
for _, pvname, owner_vg in pvlist:
|
|
1167 | 1167 |
test = ":" in pvname |
1168 | 1168 |
_ErrorIf(test, self.ENODELVM, node, "Invalid character ':' in PV" |
1169 | 1169 |
" '%s' of VG '%s'", pvname, owner_vg) |
... | ... | |
1594 | 1594 |
assert hooks_results, "invalid result from hooks" |
1595 | 1595 |
|
1596 | 1596 |
for node_name in hooks_results: |
1597 |
show_node_header = True |
|
1598 | 1597 |
res = hooks_results[node_name] |
1599 | 1598 |
msg = res.fail_msg |
1600 | 1599 |
test = msg and not res.offline |
... | ... | |
1684 | 1683 |
continue |
1685 | 1684 |
|
1686 | 1685 |
lvs = node_res.payload |
1687 |
for lv_name, (_, lv_inactive, lv_online) in lvs.items():
|
|
1686 |
for lv_name, (_, _, lv_online) in lvs.items():
|
|
1688 | 1687 |
inst = nv_dict.pop((node, lv_name), None) |
1689 | 1688 |
if (not lv_online and inst is not None |
1690 | 1689 |
and inst.name not in res_instances): |
... | ... | |
2475 | 2474 |
# Run post hooks on the node before it's removed |
2476 | 2475 |
hm = self.proc.hmclass(self.rpc.call_hooks_runner, self) |
2477 | 2476 |
try: |
2478 |
h_results = hm.RunPhase(constants.HOOKS_PHASE_POST, [node.name])
|
|
2477 |
hm.RunPhase(constants.HOOKS_PHASE_POST, [node.name]) |
|
2479 | 2478 |
except: |
2480 | 2479 |
self.LogWarning("Errors occurred running hooks on %s" % node.name) |
2481 | 2480 |
|
... | ... | |
2592 | 2591 |
if inst_fields & frozenset(self.op.output_fields): |
2593 | 2592 |
inst_data = self.cfg.GetAllInstancesInfo() |
2594 | 2593 |
|
2595 |
for instance_name, inst in inst_data.items():
|
|
2594 |
for inst in inst_data.values():
|
|
2596 | 2595 |
if inst.primary_node in node_to_primary: |
2597 | 2596 |
node_to_primary[inst.primary_node].add(inst.name) |
2598 | 2597 |
for secnode in inst.secondary_nodes: |
... | ... | |
4067 | 4066 |
|
4068 | 4067 |
""" |
4069 | 4068 |
to_skip = [] |
4070 |
for idx, disk in enumerate(self.instance.disks):
|
|
4069 |
for idx, _ in enumerate(self.instance.disks):
|
|
4071 | 4070 |
if idx not in self.op.disks: # disk idx has not been passed in |
4072 | 4071 |
to_skip.append(idx) |
4073 | 4072 |
continue |
... | ... | |
6795 | 6794 |
return iv_names |
6796 | 6795 |
|
6797 | 6796 |
def _CheckDevices(self, node_name, iv_names): |
6798 |
for name, (dev, old_lvs, new_lvs) in iv_names.iteritems():
|
|
6797 |
for name, (dev, _, _) in iv_names.iteritems():
|
|
6799 | 6798 |
self.cfg.SetDiskID(dev, node_name) |
6800 | 6799 |
|
6801 | 6800 |
result = self.rpc.call_blockdev_find(node_name, dev) |
... | ... | |
6811 | 6810 |
raise errors.OpExecError("DRBD device %s is degraded!" % name) |
6812 | 6811 |
|
6813 | 6812 |
def _RemoveOldStorage(self, node_name, iv_names): |
6814 |
for name, (dev, old_lvs, _) in iv_names.iteritems():
|
|
6813 |
for name, (_, old_lvs, _) in iv_names.iteritems():
|
|
6815 | 6814 |
self.lu.LogInfo("Remove logical volumes for %s" % name) |
6816 | 6815 |
|
6817 | 6816 |
for lv in old_lvs: |
... | ... | |
7006 | 7005 |
if self.instance.primary_node == o_node1: |
7007 | 7006 |
p_minor = o_minor1 |
7008 | 7007 |
else: |
7008 |
assert self.instance.primary_node == o_node2, "Three-node instance?" |
|
7009 | 7009 |
p_minor = o_minor2 |
7010 | 7010 |
|
7011 | 7011 |
new_alone_id = (self.instance.primary_node, self.new_node, None, |
... | ... | |
7809 | 7809 |
raise errors.OpPrereqError("Disk operations not supported for" |
7810 | 7810 |
" diskless instances", |
7811 | 7811 |
errors.ECODE_INVAL) |
7812 |
for disk_op, disk_dict in self.op.disks:
|
|
7812 |
for disk_op, _ in self.op.disks:
|
|
7813 | 7813 |
if disk_op == constants.DDM_REMOVE: |
7814 | 7814 |
if len(instance.disks) == 1: |
7815 | 7815 |
raise errors.OpPrereqError("Cannot remove the last disk of" |
... | ... | |
7853 | 7853 |
|
7854 | 7854 |
result = [] |
7855 | 7855 |
instance = self.instance |
7856 |
cluster = self.cluster |
|
7857 | 7856 |
# disk changes |
7858 | 7857 |
for disk_op, disk_dict in self.op.disks: |
7859 | 7858 |
if disk_op == constants.DDM_REMOVE: |
Also available in: Unified diff