RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #42028 from mgfritch/cephadm-infer-mismatch-fsid

Browse Source 
cephadm: infer fsid from ceph.conf

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
This commit is contained in:
Sebastian Wagner 2021-07-20 17:34:15 +02:00 committed by GitHub
commit 2cd3fc4c5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 295 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/cephadm/cephadm
View File

@ -1647,13 +1647,19 @@ def infer_fsid(func):
"""
If we only find a single fsid in /var/lib/ceph/*, use that
"""
@infer_config
@wraps(func)
def _infer_fsid(ctx: CephadmContext):
if ctx.fsid:
logger.debug('Using specified fsid: %s' % ctx.fsid)
return func(ctx)
fsids_set = set()
fsids = set()
cp = read_config(ctx.config)
if cp.has_option('global', 'fsid'):
fsids.add(cp.get('global', 'fsid'))
daemon_list = list_daemons(ctx, detail=False)
for daemon in daemon_list:
if not is_fsid(daemon['fsid']):
@ -1661,11 +1667,11 @@ def infer_fsid(func):
continue
elif 'name' not in ctx or not ctx.name:
# ctx.name not specified
fsids_set.add(daemon['fsid'])
fsids.add(daemon['fsid'])
elif daemon['name'] == ctx.name:
# ctx.name is a match
fsids_set.add(daemon['fsid'])
fsids = sorted(fsids_set)
fsids.add(daemon['fsid'])
fsids = sorted(fsids)
if not fsids:
# some commands do not always require an fsid
@ -1686,24 +1692,22 @@ def infer_config(func):
"""
@wraps(func)
def _infer_config(ctx: CephadmContext):
ctx.config = ctx.config if 'config' in ctx else None
if ctx.config:
logger.debug('Using specified config: %s' % ctx.config)
return func(ctx)
config = None
if ctx.fsid:
name = ctx.name
name = ctx.name if 'name' in ctx else None
if not name:
daemon_list = list_daemons(ctx, detail=False)
for daemon in daemon_list:
if daemon['name'].startswith('mon.'):
if daemon.get('name', '').startswith('mon.'):
name = daemon['name']
break
if name:
config = '/var/lib/ceph/{}/{}/config'.format(ctx.fsid,
name)
if config:
logger.info('Inferring config %s' % config)
ctx.config = config
ctx.config = f'/var/lib/ceph/{ctx.fsid}/{name}/config'
if ctx.config:
logger.info('Inferring config %s' % ctx.config)
elif os.path.exists(SHELL_DEFAULT_CONF):
logger.debug('Using default config: %s' % SHELL_DEFAULT_CONF)
ctx.config = SHELL_DEFAULT_CONF
@ -4494,24 +4498,15 @@ def command_run(ctx):
##################################
def fsid_conf_mismatch(ctx):
# type: (CephadmContext) -> bool
(config, _) = get_config_and_keyring(ctx)
if config:
for c in config.split('\n'):
if 'fsid = ' in c.strip():
if 'fsid = ' + ctx.fsid != c.strip():
return True
return False
@infer_fsid
@infer_config
@infer_image
def command_shell(ctx):
# type: (CephadmContext) -> int
if fsid_conf_mismatch(ctx):
raise Error('fsid does not match ceph conf')
cp = read_config(ctx.config)
if cp.has_option('global', 'fsid') and \
cp.get('global', 'fsid') != ctx.fsid:
raise Error('fsid does not match ceph.conf')
if ctx.fsid:
make_log_dir(ctx, ctx.fsid)

1
src/cephadm/tests/fixtures.py
View File

@ -101,6 +101,7 @@ def with_cephadm_ctx(
with mock.patch('cephadm.get_parm'), \
mock.patch('cephadm.attempt_bind'), \
mock.patch('cephadm.call', return_value=('', '', 0)), \
mock.patch('cephadm.call_timeout', return_value=0), \
mock.patch('cephadm.find_executable', return_value='foo'), \
mock.patch('cephadm.is_available', return_value=True), \
mock.patch('cephadm.json_loads_retry', return_value={'epoch' : 1}), \

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

@ -30,6 +30,16 @@ with mock.patch('builtins.open', create=True):
cd = SourceFileLoader('cephadm', 'cephadm').load_module()
def get_ceph_conf(
fsid='00000000-0000-0000-0000-0000deadbeef',
mon_host='[v2:192.168.1.1:3300/0,v1:192.168.1.1:6789/0]'):
return f'''
# minimal ceph.conf for {fsid}
[global]
fsid = {fsid}
mon_host = {mon_host}
'''
class TestCephAdm(object):
def test_docker_unit_file(self):
@ -542,6 +552,184 @@ docker.io/ceph/daemon-base:octopus
s = 'ceph/ceph:latest'
assert cd.normalize_image_digest(s) == f'{cd.DEFAULT_REGISTRY}/{s}'
@pytest.mark.parametrize('fsid, ceph_conf, list_daemons, result, err, ',
[
(
None,
None,
[],
None,
None,
),
(
'00000000-0000-0000-0000-0000deadbeef',
None,
[],
'00000000-0000-0000-0000-0000deadbeef',
None,
),
(
'00000000-0000-0000-0000-0000deadbeef',
None,
[
{'fsid': '10000000-0000-0000-0000-0000deadbeef'},
{'fsid': '20000000-0000-0000-0000-0000deadbeef'},
],
'00000000-0000-0000-0000-0000deadbeef',
None,
),
(
None,
None,
[
{'fsid': '00000000-0000-0000-0000-0000deadbeef'},
],
'00000000-0000-0000-0000-0000deadbeef',
None,
),
(
None,
None,
[
{'fsid': '10000000-0000-0000-0000-0000deadbeef'},
{'fsid': '20000000-0000-0000-0000-0000deadbeef'},
],
None,
r'Cannot infer an fsid',
),
(
None,
get_ceph_conf(fsid='00000000-0000-0000-0000-0000deadbeef'),
[],
'00000000-0000-0000-0000-0000deadbeef',
None,
),
(
None,
get_ceph_conf(fsid='00000000-0000-0000-0000-0000deadbeef'),
[
{'fsid': '00000000-0000-0000-0000-0000deadbeef'},
],
'00000000-0000-0000-0000-0000deadbeef',
None,
),
(
None,
get_ceph_conf(fsid='00000000-0000-0000-0000-0000deadbeef'),
[
{'fsid': '10000000-0000-0000-0000-0000deadbeef'},
{'fsid': '20000000-0000-0000-0000-0000deadbeef'},
],
None,
r'Cannot infer an fsid',
),
])
@mock.patch('cephadm.call')
def test_infer_fsid(self, _call, fsid, ceph_conf, list_daemons, result, err, cephadm_fs):
# build the context
ctx = cd.CephadmContext()
ctx.fsid = fsid
# mock the decorator
mock_fn = mock.Mock()
mock_fn.return_value = 0
infer_fsid = cd.infer_fsid(mock_fn)
# mock the ceph.conf file content
if ceph_conf:
f = cephadm_fs.create_file('ceph.conf', contents=ceph_conf)
ctx.config = f.path
# test
with mock.patch('cephadm.list_daemons', return_value=list_daemons):
if err:
with pytest.raises(cd.Error, match=err):
infer_fsid(ctx)
else:
infer_fsid(ctx)
assert ctx.fsid == result
@pytest.mark.parametrize('fsid, config, name, list_daemons, result, ',
[
(
None,
'/foo/bar.conf',
None,
[],
'/foo/bar.conf',
),
(
'00000000-0000-0000-0000-0000deadbeef',
None,
None,
[],
cd.SHELL_DEFAULT_CONF,
),
(
'00000000-0000-0000-0000-0000deadbeef',
None,
None,
[{'name': 'mon.a'}],
'/var/lib/ceph/00000000-0000-0000-0000-0000deadbeef/mon.a/config',
),
(
'00000000-0000-0000-0000-0000deadbeef',
None,
None,
[{'name': 'osd.0'}],
cd.SHELL_DEFAULT_CONF,
),
(
'00000000-0000-0000-0000-0000deadbeef',
'/foo/bar.conf',
'mon.a',
[{'name': 'mon.a'}],
'/foo/bar.conf',
),
(
'00000000-0000-0000-0000-0000deadbeef',
None,
'mon.a',
[],
'/var/lib/ceph/00000000-0000-0000-0000-0000deadbeef/mon.a/config',
),
(
'00000000-0000-0000-0000-0000deadbeef',
None,
'osd.0',
[],
'/var/lib/ceph/00000000-0000-0000-0000-0000deadbeef/osd.0/config',
),
(
None,
None,
None,
[],
cd.SHELL_DEFAULT_CONF,
),
])
@mock.patch('cephadm.call')
def test_infer_config(self, _call, fsid, config, name, list_daemons, result, cephadm_fs):
# build the context
ctx = cd.CephadmContext()
ctx.fsid = fsid
ctx.config = config
ctx.name = name
# mock the decorator
mock_fn = mock.Mock()
mock_fn.return_value = 0
infer_config = cd.infer_config(mock_fn)
# mock the shell config
cephadm_fs.create_file(cd.SHELL_DEFAULT_CONF)
# test
with mock.patch('cephadm.list_daemons', return_value=list_daemons):
infer_config(ctx)
assert ctx.config == result
class TestCustomContainer(unittest.TestCase):
cc: cd.CustomContainer
@ -1238,3 +1426,89 @@ class TestBootstrap(object):
else:
retval = cd.command_bootstrap(ctx)
assert retval == 0
class TestShell(object):
def test_fsid(self, cephadm_fs):
fsid = '00000000-0000-0000-0000-0000deadbeef'
cmd = ['shell', '--fsid', fsid]
with with_cephadm_ctx(cmd) as ctx:
retval = cd.command_shell(ctx)
assert retval == 0
assert ctx.fsid == fsid
s = get_ceph_conf(fsid=fsid)
f = cephadm_fs.create_file('ceph.conf', contents=s)
cmd = ['shell', '--fsid', fsid, '--config', f.path]
with with_cephadm_ctx(cmd) as ctx:
retval = cd.command_shell(ctx)
assert retval == 0
assert ctx.fsid == fsid
cmd = ['shell', '--fsid', '10000000-0000-0000-0000-0000deadbeef', '--config', f.path]
with with_cephadm_ctx(cmd) as ctx:
err = 'fsid does not match ceph.conf'
with pytest.raises(cd.Error, match=err):
retval = cd.command_shell(ctx)
assert retval == 1
assert ctx.fsid == None
def test_name(self, cephadm_fs):
cmd = ['shell', '--name', 'foo']
with with_cephadm_ctx(cmd) as ctx:
retval = cd.command_shell(ctx)
assert retval == 0
cmd = ['shell', '--name', 'foo.bar']
with with_cephadm_ctx(cmd) as ctx:
err = r'must pass --fsid'
with pytest.raises(cd.Error, match=err):
retval = cd.command_shell(ctx)
assert retval == 1
fsid = '00000000-0000-0000-0000-0000deadbeef'
cmd = ['shell', '--name', 'foo.bar', '--fsid', fsid]
with with_cephadm_ctx(cmd) as ctx:
retval = cd.command_shell(ctx)
assert retval == 0
def test_config(self, cephadm_fs):
cmd = ['shell']
with with_cephadm_ctx(cmd) as ctx:
retval = cd.command_shell(ctx)
assert retval == 0
assert ctx.config == None
cephadm_fs.create_file(cd.SHELL_DEFAULT_CONF)
with with_cephadm_ctx(cmd) as ctx:
retval = cd.command_shell(ctx)
assert retval == 0
assert ctx.config == cd.SHELL_DEFAULT_CONF
cmd = ['shell', '--config', 'foo']
with with_cephadm_ctx(cmd) as ctx:
retval = cd.command_shell(ctx)
assert retval == 0
assert ctx.config == 'foo'
def test_keyring(self, cephadm_fs):
cmd = ['shell']
with with_cephadm_ctx(cmd) as ctx:
retval = cd.command_shell(ctx)
assert retval == 0
assert ctx.keyring == None
cephadm_fs.create_file(cd.SHELL_DEFAULT_KEYRING)
with with_cephadm_ctx(cmd) as ctx:
retval = cd.command_shell(ctx)
assert retval == 0
assert ctx.keyring == cd.SHELL_DEFAULT_KEYRING
cmd = ['shell', '--keyring', 'foo']
with with_cephadm_ctx(cmd) as ctx:
retval = cd.command_shell(ctx)
assert retval == 0
assert ctx.keyring == 'foo'