mirror of
https://github.com/ceph/ceph
synced 2026-08-02 07:03:18 +00:00
ceph-disk: support creating block.db and block.wal with customized size for bluestore
Signed-off-by: Zhi Zhang <zhangz.david@outlook.com>
This commit is contained in:
Zhi Zhang
parent
134528c2eb
commit
4c1cd4ab17
@ -56,6 +56,16 @@ PTYPE = {
|
||||
'ready': 'cafecafe-9b03-4f30-b4c6-b4b80ceff106',
|
||||
'tobe': 'cafecafe-9b03-4f30-b4c6-b4b80ceff106',
|
||||
},
|
||||
'block.db': {
|
||||
# identical because creating a block is atomic
|
||||
'ready': '30cd0809-c2b2-499c-8879-2d6b78529876',
|
||||
'tobe': '30cd0809-c2b2-499c-8879-2d6b785292be',
|
||||
},
|
||||
'block.wal': {
|
||||
# identical because creating a block is atomic
|
||||
'ready': '5ce17fce-4087-4169-b7ff-056cc58473f9',
|
||||
'tobe': '5ce17fce-4087-4169-b7ff-056cc58472be',
|
||||
},
|
||||
'osd': {
|
||||
'ready': '4fbd7e29-9d25-41b8-afd0-062c0ceff05d',
|
||||
'tobe': '89c57f98-2fe5-4dc0-89c1-f3ad0ceff2be',
|
||||
@ -74,6 +84,14 @@ PTYPE = {
|
||||
'ready': 'cafecafe-9b03-4f30-b4c6-35865ceff106',
|
||||
'tobe': '89c57f98-2fe5-4dc0-89c1-35865ceff2be',
|
||||
},
|
||||
'block.db': {
|
||||
'ready': '166418da-c469-4022-adf4-b30afd37f176',
|
||||
'tobe': '7521c784-4626-4260-bc8d-ba77a0f5f2be',
|
||||
},
|
||||
'block.wal': {
|
||||
'ready': '86a32090-3647-40b9-bbbd-38d8c573aa86',
|
||||
'tobe': '92dad30f-175b-4d40-a5b0-5c0a258b42be',
|
||||
},
|
||||
'osd': {
|
||||
'ready': '4fbd7e29-9d25-41b8-afd0-35865ceff05d',
|
||||
'tobe': '89c57f98-2fe5-4dc0-89c1-5ec00ceff2be',
|
||||
@ -88,6 +106,14 @@ PTYPE = {
|
||||
'ready': 'cafecafe-9b03-4f30-b4c6-5ec00ceff106',
|
||||
'tobe': '89c57f98-2fe5-4dc0-89c1-35865ceff2be',
|
||||
},
|
||||
'block.db': {
|
||||
'ready': '93b0052d-02d9-4d8a-a43b-33a3ee4dfbc3',
|
||||
'tobe': '69d17c68-3e58-4399-aff0-b68265f2e2be',
|
||||
},
|
||||
'block.wal': {
|
||||
'ready': '306e8683-4fe2-4330-b7c0-00a917c16966',
|
||||
'tobe': 'f2d89683-a621-4063-964a-eb1f7863a2be',
|
||||
},
|
||||
'osd': {
|
||||
'ready': '4fbd7e29-9d25-41b8-afd0-5ec00ceff05d',
|
||||
'tobe': '89c57f98-2fe5-4dc0-89c1-5ec00ceff2be',
|
||||
@ -102,6 +128,14 @@ PTYPE = {
|
||||
'ready': 'cafecafe-8ae0-4982-bf9d-5a8d867af560',
|
||||
'tobe': 'cafecafe-8ae0-4982-bf9d-5a8d867af560',
|
||||
},
|
||||
'block.db': {
|
||||
'ready': 'ec6d6385-e346-45dc-be91-da2a7c8b3261',
|
||||
'tobe': 'ec6d6385-e346-45dc-be91-da2a7c8b32be',
|
||||
},
|
||||
'block.wal': {
|
||||
'ready': '01b41e1b-002a-453c-9f17-88793989ff8f',
|
||||
'tobe': '01b41e1b-002a-453c-9f17-88793989f2be',
|
||||
},
|
||||
'osd': {
|
||||
'ready': '4fbd7e29-8ae0-4982-bf9d-5a8d867af560',
|
||||
'tobe': '89c57f98-8ae0-4982-bf9d-5a8d867af560',
|
||||
@ -1803,6 +1837,8 @@ class PrepareBluestore(Prepare):
|
||||
self.lockbox = Lockbox(args)
|
||||
self.data = PrepareBluestoreData(args)
|
||||
self.block = PrepareBluestoreBlock(args)
|
||||
self.blockdb = PrepareBluestoreBlockDB(args)
|
||||
self.blockwal = PrepareBluestoreBlockWAL(args)
|
||||
|
||||
@staticmethod
|
||||
def parser():
|
||||
@ -1819,17 +1855,19 @@ class PrepareBluestore(Prepare):
|
||||
return [
|
||||
PrepareBluestore.parser(),
|
||||
PrepareBluestoreBlock.parser(),
|
||||
PrepareBluestoreBlockDB.parser(),
|
||||
PrepareBluestoreBlockWAL.parser(),
|
||||
]
|
||||
|
||||
def prepare_locked(self):
|
||||
if self.data.args.dmcrypt:
|
||||
self.lockbox.prepare()
|
||||
self.data.prepare(self.block)
|
||||
self.data.prepare(self.blockdb, self.blockwal, self.block)
|
||||
|
||||
|
||||
class Space(object):
|
||||
|
||||
NAMES = ('block', 'journal')
|
||||
NAMES = ('block', 'journal', 'block.db', 'block.wal')
|
||||
|
||||
|
||||
class PrepareSpace(object):
|
||||
@ -1901,7 +1939,7 @@ class PrepareSpace(object):
|
||||
return self.type == self.DEVICE
|
||||
|
||||
@staticmethod
|
||||
def parser(name):
|
||||
def parser(name, positional=True):
|
||||
parser = argparse.ArgumentParser(add_help=False)
|
||||
parser.add_argument(
|
||||
'--%s-uuid' % name,
|
||||
@ -1918,13 +1956,15 @@ class PrepareSpace(object):
|
||||
action='store_true', default=None,
|
||||
help='verify that %s is a block device' % name.upper(),
|
||||
)
|
||||
parser.add_argument(
|
||||
name,
|
||||
metavar=name.upper(),
|
||||
nargs='?',
|
||||
help=('path to OSD %s disk block device;' % name +
|
||||
' leave out to store %s in file' % name),
|
||||
)
|
||||
|
||||
if positional:
|
||||
parser.add_argument(
|
||||
name,
|
||||
metavar=name.upper(),
|
||||
nargs='?',
|
||||
help=('path to OSD %s disk block device;' % name +
|
||||
' leave out to store %s in file' % name),
|
||||
)
|
||||
return parser
|
||||
|
||||
def wants_space(self):
|
||||
@ -2065,17 +2105,18 @@ class PrepareSpace(object):
|
||||
partition.format()
|
||||
partition.map()
|
||||
|
||||
command_check_call(
|
||||
[
|
||||
'sgdisk',
|
||||
'--typecode={num}:{uuid}'.format(
|
||||
num=num,
|
||||
uuid=partition.ptype_for_name(self.name),
|
||||
),
|
||||
'--',
|
||||
getattr(self.args, self.name),
|
||||
],
|
||||
)
|
||||
command_check_call(
|
||||
[
|
||||
'sgdisk',
|
||||
'--typecode={num}:{uuid}'.format(
|
||||
num=num,
|
||||
uuid=partition.ptype_for_name(self.name),
|
||||
),
|
||||
'--',
|
||||
getattr(self.args, self.name),
|
||||
],
|
||||
)
|
||||
update_partition(getattr(self.args, self.name), 'prepared')
|
||||
|
||||
LOG.debug('%s is GPT partition %s',
|
||||
self.name.capitalize(),
|
||||
@ -2125,7 +2166,15 @@ class PrepareBluestoreBlock(PrepareSpace):
|
||||
super(PrepareBluestoreBlock, self).__init__(args)
|
||||
|
||||
def get_space_size(self):
|
||||
return 0 # get as much space as possible
|
||||
block_size = get_conf(
|
||||
cluster=self.args.cluster,
|
||||
variable='bluestore_block_size',
|
||||
)
|
||||
|
||||
if block_size is None:
|
||||
return 0 # get as much space as possible
|
||||
else:
|
||||
return int(block_size) / 1048576 # MB
|
||||
|
||||
def desired_partition_number(self):
|
||||
if self.args.block == self.args.data:
|
||||
@ -2139,6 +2188,76 @@ class PrepareBluestoreBlock(PrepareSpace):
|
||||
return PrepareSpace.parser('block')
|
||||
|
||||
|
||||
class PrepareBluestoreBlockDB(PrepareSpace):
|
||||
|
||||
def __init__(self, args):
|
||||
self.name = 'block.db'
|
||||
super(PrepareBluestoreBlockDB, self).__init__(args)
|
||||
|
||||
def get_space_size(self):
|
||||
block_size = get_conf(
|
||||
cluster=self.args.cluster,
|
||||
variable='bluestore_block_db_size',
|
||||
)
|
||||
|
||||
if block_size is None:
|
||||
return 64 # MB, default value
|
||||
else:
|
||||
return int(block_size) / 1048576 # MB
|
||||
|
||||
def desired_partition_number(self):
|
||||
if getattr(self.args, 'block.db') == self.args.data:
|
||||
num = 3
|
||||
else:
|
||||
num = 0
|
||||
return num
|
||||
|
||||
@staticmethod
|
||||
def parser():
|
||||
parser = PrepareSpace.parser('block.db', positional=False)
|
||||
parser.add_argument(
|
||||
'--block.db',
|
||||
metavar='BLOCKDB',
|
||||
help='path to the device or file for bluestore block.db',
|
||||
)
|
||||
return parser
|
||||
|
||||
|
||||
class PrepareBluestoreBlockWAL(PrepareSpace):
|
||||
|
||||
def __init__(self, args):
|
||||
self.name = 'block.wal'
|
||||
super(PrepareBluestoreBlockWAL, self).__init__(args)
|
||||
|
||||
def get_space_size(self):
|
||||
block_size = get_conf(
|
||||
cluster=self.args.cluster,
|
||||
variable='bluestore_block_wal_size',
|
||||
)
|
||||
|
||||
if block_size is None:
|
||||
return 128 # MB, default value
|
||||
else:
|
||||
return int(block_size) / 1048576 # MB
|
||||
|
||||
def desired_partition_number(self):
|
||||
if getattr(self.args, 'block.wal') == self.args.data:
|
||||
num = 4
|
||||
else:
|
||||
num = 0
|
||||
return num
|
||||
|
||||
@staticmethod
|
||||
def parser():
|
||||
parser = PrepareSpace.parser('block.wal', positional=False)
|
||||
parser.add_argument(
|
||||
'--block.wal',
|
||||
metavar='BLOCKWAL',
|
||||
help='path to the device or file for bluestore block.wal',
|
||||
)
|
||||
return parser
|
||||
|
||||
|
||||
class CryptHelpers(object):
|
||||
|
||||
@staticmethod
|
||||
@ -4380,7 +4499,11 @@ def main_trigger(args):
|
||||
)
|
||||
|
||||
elif parttype in (PTYPE['regular']['block']['ready'],
|
||||
PTYPE['mpath']['block']['ready']):
|
||||
PTYPE['regular']['block.db']['ready'],
|
||||
PTYPE['regular']['block.wal']['ready'],
|
||||
PTYPE['mpath']['block']['ready'],
|
||||
PTYPE['mpath']['block.db']['ready'],
|
||||
PTYPE['mpath']['block.wal']['ready']):
|
||||
out, err, ret = command(
|
||||
ceph_disk +
|
||||
[
|
||||
@ -4390,7 +4513,11 @@ def main_trigger(args):
|
||||
)
|
||||
|
||||
elif parttype in (PTYPE['plain']['block']['ready'],
|
||||
PTYPE['luks']['block']['ready']):
|
||||
PTYPE['plain']['block.db']['ready'],
|
||||
PTYPE['plain']['block.wal']['ready'],
|
||||
PTYPE['luks']['block']['ready'],
|
||||
PTYPE['luks']['block.db']['ready'],
|
||||
PTYPE['luks']['block.wal']['ready']):
|
||||
out, err, ret = command(
|
||||
ceph_disk +
|
||||
[
|
||||
|
||||
@ -28,6 +28,26 @@ ACTION=="change", SUBSYSTEM=="block", \
|
||||
ENV{ID_PART_ENTRY_TYPE}=="cafecafe-9b03-4f30-b4c6-b4b80ceff106", \
|
||||
OWNER="ceph", GROUP="ceph", MODE="660"
|
||||
|
||||
# BLOCK.DB_UUID
|
||||
ACTION=="add", SUBSYSTEM=="block", \
|
||||
ENV{DEVTYPE}=="partition", \
|
||||
ENV{ID_PART_ENTRY_TYPE}=="30cd0809-c2b2-499c-8879-2d6b78529876", \
|
||||
OWNER:="ceph", GROUP:="ceph", MODE:="660", \
|
||||
RUN+="/usr/sbin/ceph-disk --log-stdout -v trigger /dev/$name"
|
||||
ACTION=="change", SUBSYSTEM=="block", \
|
||||
ENV{ID_PART_ENTRY_TYPE}=="30cd0809-c2b2-499c-8879-2d6b78529876", \
|
||||
OWNER="ceph", GROUP="ceph", MODE="660"
|
||||
|
||||
# BLOCK.WAL_UUID
|
||||
ACTION=="add", SUBSYSTEM=="block", \
|
||||
ENV{DEVTYPE}=="partition", \
|
||||
ENV{ID_PART_ENTRY_TYPE}=="5ce17fce-4087-4169-b7ff-056cc58473f9", \
|
||||
OWNER:="ceph", GROUP:="ceph", MODE:="660", \
|
||||
RUN+="/usr/sbin/ceph-disk --log-stdout -v trigger /dev/$name"
|
||||
ACTION=="change", SUBSYSTEM=="block", \
|
||||
ENV{ID_PART_ENTRY_TYPE}=="5ce17fce-4087-4169-b7ff-056cc58473f9", \
|
||||
OWNER="ceph", GROUP="ceph", MODE="660"
|
||||
|
||||
# LOCKBOX_UUID
|
||||
ACTION=="add", SUBSYSTEM=="block", \
|
||||
ENV{DEVTYPE}=="partition", \
|
||||
@ -65,6 +85,24 @@ ACTION=="change", SUBSYSTEM=="block", \
|
||||
ENV{ID_PART_ENTRY_TYPE}=="cafecafe-8ae0-4982-bf9d-5a8d867af560", \
|
||||
OWNER="ceph", GROUP="ceph", MODE="660"
|
||||
|
||||
# MPATH_BLOCK.DB_UUID
|
||||
ACTION=="add", SUBSYSTEM=="block", \
|
||||
ENV{ID_PART_ENTRY_TYPE}=="ec6d6385-e346-45dc-be91-da2a7c8b3261", \
|
||||
OWNER:="ceph", GROUP:="ceph", MODE:="660", \
|
||||
RUN+="/usr/sbin/ceph-disk --log-stdout -v trigger /dev/$name"
|
||||
ACTION=="change", SUBSYSTEM=="block", \
|
||||
ENV{ID_PART_ENTRY_TYPE}=="ec6d6385-e346-45dc-be91-da2a7c8b3261", \
|
||||
OWNER="ceph", GROUP="ceph", MODE="660"
|
||||
|
||||
# MPATH_BLOCK.WAL_UUID
|
||||
ACTION=="add", SUBSYSTEM=="block", \
|
||||
ENV{ID_PART_ENTRY_TYPE}=="01b41e1b-002a-453c-9f17-88793989ff8f", \
|
||||
OWNER:="ceph", GROUP:="ceph", MODE:="660", \
|
||||
RUN+="/usr/sbin/ceph-disk --log-stdout -v trigger /dev/$name"
|
||||
ACTION=="change", SUBSYSTEM=="block", \
|
||||
ENV{ID_PART_ENTRY_TYPE}=="01b41e1b-002a-453c-9f17-88793989ff8f", \
|
||||
OWNER="ceph", GROUP="ceph", MODE="660"
|
||||
|
||||
# MPATH_BLOCK_UUID
|
||||
ACTION=="add", SUBSYSTEM=="block", \
|
||||
ENV{ID_PART_ENTRY_TYPE}=="7f4a666a-16f3-47a2-8445-152ef4d03f6c", \
|
||||
@ -94,6 +132,26 @@ ACTION=="change", SUBSYSTEM=="block", \
|
||||
ENV{ID_PART_ENTRY_TYPE}=="cafecafe-9b03-4f30-b4c6-5ec00ceff106", \
|
||||
OWNER="ceph", GROUP="ceph", MODE="660"
|
||||
|
||||
# DMCRYPT_BLOCK.DB_UUID
|
||||
ACTION=="add" SUBSYSTEM=="block", \
|
||||
ENV{DEVTYPE}=="partition", \
|
||||
ENV{ID_PART_ENTRY_TYPE}=="93b0052d-02d9-4d8a-a43b-33a3ee4dfbc3", \
|
||||
OWNER:="ceph", GROUP:="ceph", MODE:="660", \
|
||||
RUN+="/usr/sbin/ceph-disk --log-stdout -v trigger /dev/$name"
|
||||
ACTION=="change", SUBSYSTEM=="block", \
|
||||
ENV{ID_PART_ENTRY_TYPE}=="93b0052d-02d9-4d8a-a43b-33a3ee4dfbc3", \
|
||||
OWNER="ceph", GROUP="ceph", MODE="660"
|
||||
|
||||
# DMCRYPT_BLOCK.WAL_UUID
|
||||
ACTION=="add" SUBSYSTEM=="block", \
|
||||
ENV{DEVTYPE}=="partition", \
|
||||
ENV{ID_PART_ENTRY_TYPE}=="306e8683-4fe2-4330-b7c0-00a917c16966", \
|
||||
OWNER:="ceph", GROUP:="ceph", MODE:="660", \
|
||||
RUN+="/usr/sbin/ceph-disk --log-stdout -v trigger /dev/$name"
|
||||
ACTION=="change", SUBSYSTEM=="block", \
|
||||
ENV{ID_PART_ENTRY_TYPE}=="306e8683-4fe2-4330-b7c0-00a917c16966", \
|
||||
OWNER="ceph", GROUP="ceph", MODE="660"
|
||||
|
||||
# DMCRYPT_LUKS_JOURNAL_UUID
|
||||
ACTION=="add" SUBSYSTEM=="block", \
|
||||
ENV{DEVTYPE}=="partition", \
|
||||
@ -114,6 +172,26 @@ ACTION=="change", SUBSYSTEM=="block", \
|
||||
ENV{ID_PART_ENTRY_TYPE}=="cafecafe-9b03-4f30-b4c6-35865ceff106", \
|
||||
OWNER="ceph", GROUP="ceph", MODE="660"
|
||||
|
||||
# DMCRYPT_LUKS_BLOCK.DB_UUID
|
||||
ACTION=="add" SUBSYSTEM=="block", \
|
||||
ENV{DEVTYPE}=="partition", \
|
||||
ENV{ID_PART_ENTRY_TYPE}=="166418da-c469-4022-adf4-b30afd37f176", \
|
||||
OWNER:="ceph", GROUP:="ceph", MODE:="660", \
|
||||
RUN+="/usr/sbin/ceph-disk --log-stdout -v trigger /dev/$name"
|
||||
ACTION=="change", SUBSYSTEM=="block", \
|
||||
ENV{ID_PART_ENTRY_TYPE}=="166418da-c469-4022-adf4-b30afd37f176", \
|
||||
OWNER="ceph", GROUP="ceph", MODE="660"
|
||||
|
||||
# DMCRYPT_LUKS_BLOCK.WAL_UUID
|
||||
ACTION=="add" SUBSYSTEM=="block", \
|
||||
ENV{DEVTYPE}=="partition", \
|
||||
ENV{ID_PART_ENTRY_TYPE}=="86a32090-3647-40b9-bbbd-38d8c573aa86", \
|
||||
OWNER:="ceph", GROUP:="ceph", MODE:="660", \
|
||||
RUN+="/usr/sbin/ceph-disk --log-stdout -v trigger /dev/$name"
|
||||
ACTION=="change", SUBSYSTEM=="block", \
|
||||
ENV{ID_PART_ENTRY_TYPE}=="86a32090-3647-40b9-bbbd-38d8c573aa86", \
|
||||
OWNER="ceph", GROUP="ceph", MODE="660"
|
||||
|
||||
# DMCRYPT_OID_UUID
|
||||
ACTION=="add" SUBSYSTEM=="block", \
|
||||
ENV{DEVTYPE}=="partition", \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user
