Revision 0c3d9c7c lib/cmdlib/instance.py
| b/lib/cmdlib/instance.py | ||
|---|---|---|
| 1389 | 1389 |
dt = masterd.instance.DiskTransfer("disk/%s" % idx,
|
| 1390 | 1390 |
constants.IEIO_FILE, (image, ), |
| 1391 | 1391 |
constants.IEIO_SCRIPT, |
| 1392 |
(iobj.disks[idx], idx),
|
|
| 1392 |
((iobj.disks[idx], iobj), idx),
|
|
| 1393 | 1393 |
None) |
| 1394 | 1394 |
transfers.append(dt) |
| 1395 | 1395 |
|
| ... | ... | |
| 1574 | 1574 |
for (idx, disk) in enumerate(renamed_inst.disks): |
| 1575 | 1575 |
for node_uuid in renamed_inst.all_nodes: |
| 1576 | 1576 |
self.cfg.SetDiskID(disk, node_uuid) |
| 1577 |
result = self.rpc.call_blockdev_setinfo(node_uuid, disk, info) |
|
| 1577 |
result = self.rpc.call_blockdev_setinfo(node_uuid, |
|
| 1578 |
(disk, renamed_inst), info) |
|
| 1578 | 1579 |
result.Warn("Error setting info on node %s for disk %s" %
|
| 1579 | 1580 |
(self.cfg.GetNodeName(node_uuid), idx), self.LogWarning) |
| 1580 | 1581 |
try: |
| ... | ... | |
| 3098 | 3099 |
self.instance.uuid, pnode_uuid, |
| 3099 | 3100 |
[snode_uuid], disk_info, None, None, 0, |
| 3100 | 3101 |
feedback_fn, self.diskparams) |
| 3101 |
anno_disks = rpc.AnnotateDiskParams(constants.DT_DRBD8, new_disks, |
|
| 3102 |
self.diskparams) |
|
| 3102 |
anno_disks = rpc.AnnotateDiskParams(new_disks, self.diskparams) |
|
| 3103 | 3103 |
p_excl_stor = IsExclusiveStorageEnabledNodeUuid(self.cfg, pnode_uuid) |
| 3104 | 3104 |
s_excl_stor = IsExclusiveStorageEnabledNodeUuid(self.cfg, snode_uuid) |
| 3105 | 3105 |
info = GetInstanceInfoText(self.instance) |
| ... | ... | |
| 3195 | 3195 |
feedback_fn("Removing volumes on the secondary node...")
|
| 3196 | 3196 |
for disk in old_disks: |
| 3197 | 3197 |
self.cfg.SetDiskID(disk, snode_uuid) |
| 3198 |
result = self.rpc.call_blockdev_remove(snode_uuid, disk)
|
|
| 3198 |
result = self.rpc.call_blockdev_remove(snode_uuid, (disk, self.instance))
|
|
| 3199 | 3199 |
result.Warn("Could not remove block device %s on node %s,"
|
| 3200 | 3200 |
" continuing anyway" % |
| 3201 | 3201 |
(disk.iv_name, self.cfg.GetNodeName(snode_uuid)), |
| ... | ... | |
| 3205 | 3205 |
for idx, disk in enumerate(old_disks): |
| 3206 | 3206 |
meta = disk.children[1] |
| 3207 | 3207 |
self.cfg.SetDiskID(meta, pnode_uuid) |
| 3208 |
result = self.rpc.call_blockdev_remove(pnode_uuid, meta)
|
|
| 3208 |
result = self.rpc.call_blockdev_remove(pnode_uuid, (meta, self.instance))
|
|
| 3209 | 3209 |
result.Warn("Could not remove metadata for disk %d on node %s,"
|
| 3210 | 3210 |
" continuing anyway" % |
| 3211 | 3211 |
(idx, self.cfg.GetNodeName(pnode_uuid)), |
| ... | ... | |
| 3265 | 3265 |
for node_uuid, disk in anno_disk.ComputeNodeTree( |
| 3266 | 3266 |
self.instance.primary_node): |
| 3267 | 3267 |
self.cfg.SetDiskID(disk, node_uuid) |
| 3268 |
msg = self.rpc.call_blockdev_remove(node_uuid, disk).fail_msg |
|
| 3268 |
msg = self.rpc.call_blockdev_remove(node_uuid, (disk, self.instance)) \ |
|
| 3269 |
.fail_msg |
|
| 3269 | 3270 |
if msg: |
| 3270 | 3271 |
self.LogWarning("Could not remove disk/%d on node '%s': %s,"
|
| 3271 | 3272 |
" continuing anyway", idx, |
Also available in: Unified diff