Revision 6ccce5d4 lib/cmdlib/instance.py
| b/lib/cmdlib/instance.py | ||
|---|---|---|
| 3146 | 3146 |
mem_check_list = [pnode_uuid] |
| 3147 | 3147 |
if be_new[constants.BE_AUTO_BALANCE]: |
| 3148 | 3148 |
# either we changed auto_balance to yes or it was from before |
| 3149 |
mem_check_list.extend(self.instance.secondary_nodes) |
|
| 3149 |
mem_check_list.extend( |
|
| 3150 |
self.cfg.GetInstanceSecondaryNodes(self.instance)) |
|
| 3150 | 3151 |
instance_info = self.rpc.call_instance_info( |
| 3151 | 3152 |
pnode_uuid, self.instance.name, self.instance.hypervisor, |
| 3152 | 3153 |
cluster_hvparams) |
| ... | ... | |
| 3188 | 3189 |
miss_mem, errors.ECODE_NORES) |
| 3189 | 3190 |
|
| 3190 | 3191 |
if be_new[constants.BE_AUTO_BALANCE]: |
| 3192 |
secondary_nodes = self.cfg.GetInstanceSecondaryNodes(self.instance) |
|
| 3191 | 3193 |
for node_uuid, nres in nodeinfo.items(): |
| 3192 |
if node_uuid not in self.instance.secondary_nodes:
|
|
| 3194 |
if node_uuid not in secondary_nodes: |
|
| 3193 | 3195 |
continue |
| 3194 | 3196 |
nres.Raise("Can't get info from secondary node %s" %
|
| 3195 | 3197 |
self.cfg.GetNodeName(node_uuid), prereq=True, |
| ... | ... | |
| 3396 | 3398 |
"""Converts an instance from drbd to plain. |
| 3397 | 3399 |
|
| 3398 | 3400 |
""" |
| 3399 |
assert len(self.instance.secondary_nodes) == 1 |
|
| 3401 |
secondary_nodes = self.cfg.GetInstanceSecondaryNodes(self.instance) |
|
| 3402 |
assert len(secondary_nodes) == 1 |
|
| 3400 | 3403 |
assert self.instance.disk_template == constants.DT_DRBD8 |
| 3401 | 3404 |
|
| 3402 | 3405 |
pnode_uuid = self.instance.primary_node |
| 3403 |
snode_uuid = self.instance.secondary_nodes[0]
|
|
| 3406 |
snode_uuid = secondary_nodes[0] |
|
| 3404 | 3407 |
feedback_fn("Converting template to plain")
|
| 3405 | 3408 |
|
| 3406 | 3409 |
old_disks = AnnotateDiskParams(self.instance, self.instance.disks, self.cfg) |
| ... | ... | |
| 3471 | 3474 |
else: |
| 3472 | 3475 |
file_driver = file_path = None |
| 3473 | 3476 |
|
| 3477 |
secondary_nodes = self.cfg.GetInstanceSecondaryNodes(self.instance) |
|
| 3474 | 3478 |
disk = \ |
| 3475 | 3479 |
GenerateDiskTemplate(self, self.instance.disk_template, |
| 3476 | 3480 |
self.instance.uuid, self.instance.primary_node, |
| 3477 |
self.instance.secondary_nodes, [params], file_path,
|
|
| 3481 |
secondary_nodes, [params], file_path, |
|
| 3478 | 3482 |
file_driver, idx, self.Log, self.diskparams)[0] |
| 3479 | 3483 |
|
| 3480 | 3484 |
new_disks = CreateDisks(self, self.instance, disks=[disk]) |
Also available in: Unified diff