From ef0c84777286d19a07acc6a1945023e0636bf74c Mon Sep 17 00:00:00 2001 From: Adam King Date: Wed, 24 Nov 2021 17:23:01 -0500 Subject: [PATCH] cephadm: only infer conf from mon if fsid matches fixes: https://tracker.ceph.com/issues/53394 Signed-off-by: Adam King (cherry picked from commit f64b8a34c4808af5f09ddc5de8085d78b50a9666) --- src/cephadm/cephadm | 2 +- src/cephadm/tests/test_cephadm.py | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 77542628c12c5..d080c9b170510 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -1724,7 +1724,7 @@ def infer_config(func: FuncT) -> FuncT: if not name: daemon_list = list_daemons(ctx, detail=False) for daemon in daemon_list: - if daemon.get('name', '').startswith('mon.'): + if daemon.get('name', '').startswith('mon.') and daemon.get('fsid', '') == ctx.fsid: name = daemon['name'] break if name: diff --git a/src/cephadm/tests/test_cephadm.py b/src/cephadm/tests/test_cephadm.py index 5d45fdb40df43..3873c660924f2 100644 --- a/src/cephadm/tests/test_cephadm.py +++ b/src/cephadm/tests/test_cephadm.py @@ -457,9 +457,16 @@ docker.io/ceph/daemon-base:octopus '00000000-0000-0000-0000-0000deadbeef', None, None, - [{'name': 'mon.a'}], + [{'name': 'mon.a', 'fsid': '00000000-0000-0000-0000-0000deadbeef'}], '/var/lib/ceph/00000000-0000-0000-0000-0000deadbeef/mon.a/config', ), + ( + '00000000-0000-0000-0000-0000deadbeef', + None, + None, + [{'name': 'mon.a', 'fsid': 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'}], + cd.SHELL_DEFAULT_CONF, + ), ( '00000000-0000-0000-0000-0000deadbeef', None, -- 2.39.5