Revision cd3b4ff4 lib/cmdlib/instance_storage.py
| b/lib/cmdlib/instance_storage.py | ||
|---|---|---|
| 55 | 55 |
} |
| 56 | 56 |
|
| 57 | 57 |
|
| 58 |
_DISK_TEMPLATE_DEVICE_TYPE = {
|
|
| 59 |
constants.DT_PLAIN: constants.LD_LV, |
|
| 60 |
constants.DT_FILE: constants.LD_FILE, |
|
| 61 |
constants.DT_SHARED_FILE: constants.LD_FILE, |
|
| 62 |
constants.DT_BLOCK: constants.LD_BLOCKDEV, |
|
| 63 |
constants.DT_RBD: constants.LD_RBD, |
|
| 64 |
constants.DT_EXT: constants.LD_EXT, |
|
| 65 |
} |
|
| 66 |
|
|
| 67 |
|
|
| 68 | 58 |
def CreateSingleBlockDev(lu, node_uuid, instance, device, info, force_open, |
| 69 | 59 |
excl_stor): |
| 70 | 60 |
"""Create a single block device on a given node. |
| ... | ... | |
| 390 | 380 |
port = lu.cfg.AllocatePort() |
| 391 | 381 |
shared_secret = lu.cfg.GenerateDRBDSecret(lu.proc.GetECId()) |
| 392 | 382 |
|
| 393 |
dev_data = objects.Disk(dev_type=constants.LD_LV, size=size,
|
|
| 383 |
dev_data = objects.Disk(dev_type=constants.DT_PLAIN, size=size,
|
|
| 394 | 384 |
logical_id=(vgnames[0], names[0]), |
| 395 | 385 |
params={})
|
| 396 | 386 |
dev_data.uuid = lu.cfg.GenerateUniqueID(lu.proc.GetECId()) |
| 397 |
dev_meta = objects.Disk(dev_type=constants.LD_LV,
|
|
| 387 |
dev_meta = objects.Disk(dev_type=constants.DT_PLAIN,
|
|
| 398 | 388 |
size=constants.DRBD_META_SIZE, |
| 399 | 389 |
logical_id=(vgnames[1], names[1]), |
| 400 | 390 |
params={})
|
| 401 | 391 |
dev_meta.uuid = lu.cfg.GenerateUniqueID(lu.proc.GetECId()) |
| 402 |
drbd_dev = objects.Disk(dev_type=constants.LD_DRBD8, size=size,
|
|
| 392 |
drbd_dev = objects.Disk(dev_type=constants.DT_DRBD8, size=size,
|
|
| 403 | 393 |
logical_id=(primary_uuid, secondary_uuid, port, |
| 404 | 394 |
p_minor, s_minor, |
| 405 | 395 |
shared_secret), |
| ... | ... | |
| 493 | 483 |
else: |
| 494 | 484 |
raise errors.ProgrammerError("Unknown disk template '%s'" % template_name)
|
| 495 | 485 |
|
| 496 |
dev_type = _DISK_TEMPLATE_DEVICE_TYPE[template_name]
|
|
| 486 |
dev_type = template_name
|
|
| 497 | 487 |
|
| 498 | 488 |
for idx, disk in enumerate(disk_info): |
| 499 | 489 |
params = {}
|
| ... | ... | |
| 819 | 809 |
continue |
| 820 | 810 |
|
| 821 | 811 |
# update secondaries for disks, if needed |
| 822 |
if self.op.node_uuids and disk.dev_type == constants.LD_DRBD8:
|
|
| 812 |
if self.op.node_uuids and disk.dev_type == constants.DT_DRBD8:
|
|
| 823 | 813 |
# need to update the nodes and minors |
| 824 | 814 |
assert len(self.op.node_uuids) == 2 |
| 825 | 815 |
assert len(disk.logical_id) == 6 # otherwise disk internals |
| ... | ... | |
| 840 | 830 |
for idx, new_id, changes in mods: |
| 841 | 831 |
disk = self.instance.disks[idx] |
| 842 | 832 |
if new_id is not None: |
| 843 |
assert disk.dev_type == constants.LD_DRBD8
|
|
| 833 |
assert disk.dev_type == constants.DT_DRBD8
|
|
| 844 | 834 |
disk.logical_id = new_id |
| 845 | 835 |
if changes: |
| 846 | 836 |
disk.Update(size=changes.get(constants.IDISK_SIZE, None), |
| ... | ... | |
| 2261 | 2251 |
|
| 2262 | 2252 |
(data_disk, meta_disk) = dev.children |
| 2263 | 2253 |
vg_data = data_disk.logical_id[0] |
| 2264 |
lv_data = objects.Disk(dev_type=constants.LD_LV, size=dev.size,
|
|
| 2254 |
lv_data = objects.Disk(dev_type=constants.DT_PLAIN, size=dev.size,
|
|
| 2265 | 2255 |
logical_id=(vg_data, names[0]), |
| 2266 | 2256 |
params=data_disk.params) |
| 2267 | 2257 |
vg_meta = meta_disk.logical_id[0] |
| 2268 |
lv_meta = objects.Disk(dev_type=constants.LD_LV,
|
|
| 2258 |
lv_meta = objects.Disk(dev_type=constants.DT_PLAIN,
|
|
| 2269 | 2259 |
size=constants.DRBD_META_SIZE, |
| 2270 | 2260 |
logical_id=(vg_meta, names[1]), |
| 2271 | 2261 |
params=meta_disk.params) |
| ... | ... | |
| 2541 | 2531 |
iv_names[idx] = (dev, dev.children, new_net_id) |
| 2542 | 2532 |
logging.debug("Allocated new_minor: %s, new_logical_id: %s", new_minor,
|
| 2543 | 2533 |
new_net_id) |
| 2544 |
new_drbd = objects.Disk(dev_type=constants.LD_DRBD8,
|
|
| 2534 |
new_drbd = objects.Disk(dev_type=constants.DT_DRBD8,
|
|
| 2545 | 2535 |
logical_id=new_alone_id, |
| 2546 | 2536 |
children=dev.children, |
| 2547 | 2537 |
size=dev.size, |
Also available in: Unified diff