RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-11 21:50:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

cephadm: validate --fsid during bootstrap

Browse Source 
Signed-off-by: Michael Fritch <mfritch@suse.com>
This commit is contained in:
Michael Fritch 2021-06-09 17:45:03 -06:00
parent 64281bb394
commit 37ff72ac9b
No known key found for this signature in database
GPG Key ID: 75F3EB2E80A03B7F
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cephadm/cephadm
View File

@ -4026,12 +4026,15 @@ def command_bootstrap(ctx):
# initial vars
fsid = ctx.fsid or make_fsid()
if not is_fsid(fsid):
raise Error('not an fsid: %s' % fsid)
logger.info('Cluster fsid: %s' % fsid)
hostname = get_hostname()
if '.' in hostname and not ctx.allow_fqdn_hostname:
raise Error('hostname is a fully qualified domain name (%s); either fix (e.g., "sudo hostname %s" or similar) or pass --allow-fqdn-hostname' % (hostname, hostname.split('.')[0]))
mon_id = ctx.mon_id or hostname
mgr_id = ctx.mgr_id or generate_service_id()
logger.info('Cluster fsid: %s' % fsid)
lock = FileLock(ctx, fsid)
lock.acquire()

21
src/cephadm/tests/test_cephadm.py
View File

@ -1157,3 +1157,24 @@ class TestBootstrap(TestCephAdm):
with with_cephadm_ctx(cmd, hostname=hostname) as ctx:
retval = cd.command_bootstrap(ctx)
assert retval == 0
@pytest.mark.parametrize('fsid, err',
[
('', None),
('00000000-0000-0000-0000-0000deadbeef', None),
('00000000-0000-0000-0000-0000deadbeez', 'not an fsid'),
])
def test_fsid(self, fsid, err, cephadm_fs):
cmd = self._get_cmd(
'--mon-ip', '192.168.1.1',
'--skip-mon-network',
'--fsid', fsid,
)
with with_cephadm_ctx(cmd) as ctx:
if err:
with pytest.raises(cd.Error, match=err):
cd.command_bootstrap(ctx)
else:
retval = cd.command_bootstrap(ctx)
assert retval == 0