Revision dab69e97
b/lib/backend.py | ||
---|---|---|
1017 | 1017 |
crdev.Open() |
1018 | 1018 |
clist.append(crdev) |
1019 | 1019 |
|
1020 |
device = bdev.Create(disk.dev_type, disk.physical_id, clist, size) |
|
1020 |
try: |
|
1021 |
device = bdev.Create(disk.dev_type, disk.physical_id, clist, size) |
|
1022 |
except errors.GenericError, err: |
|
1023 |
return False, "Can't create block device: %s" % str(err) |
|
1021 | 1024 |
|
1022 | 1025 |
if on_primary or disk.AssembleOnSecondary(): |
1023 | 1026 |
if not device.Assemble(): |
1024 |
errorstring = "Can't assemble device after creation" |
|
1027 |
errorstring = "Can't assemble device after creation, very unusual event"
|
|
1025 | 1028 |
logging.error(errorstring) |
1026 |
raise errors.BlockDeviceError("%s, very unusual event - check the node" |
|
1027 |
" daemon logs" % errorstring) |
|
1029 |
return False, errorstring |
|
1028 | 1030 |
device.SetSyncSpeed(constants.SYNC_SPEED) |
1029 | 1031 |
if on_primary or disk.OpenOnSecondary(): |
1030 | 1032 |
device.Open(force=True) |
... | ... | |
1034 | 1036 |
device.SetInfo(info) |
1035 | 1037 |
|
1036 | 1038 |
physical_id = device.unique_id |
1037 |
return physical_id |
|
1039 |
return True, physical_id
|
|
1038 | 1040 |
|
1039 | 1041 |
|
1040 | 1042 |
def RemoveBlockDevice(disk): |
b/lib/cmdlib.py | ||
---|---|---|
3702 | 3702 |
_CreateBlockDevOnPrimary(lu, node, instance, child, info) |
3703 | 3703 |
|
3704 | 3704 |
lu.cfg.SetDiskID(device, node) |
3705 |
new_id = lu.rpc.call_blockdev_create(node, device, device.size,
|
|
3705 |
result = lu.rpc.call_blockdev_create(node, device, device.size,
|
|
3706 | 3706 |
instance.name, True, info) |
3707 |
if new_id.failed or not new_id.data: |
|
3707 |
msg = result.RemoteFailMsg() |
|
3708 |
if msg: |
|
3708 | 3709 |
raise errors.OpExecError("Can't create block device %s on primary" |
3709 |
" node %s" % (device, node))
|
|
3710 |
" node %s: %s" % (device, node, msg))
|
|
3710 | 3711 |
if device.physical_id is None: |
3711 |
device.physical_id = new_id
|
|
3712 |
device.physical_id = result.data[1]
|
|
3712 | 3713 |
|
3713 | 3714 |
|
3714 | 3715 |
def _CreateBlockDevOnSecondary(lu, node, instance, device, force, info): |
Also available in: Unified diff