From: Adam King <adking@redhat.com>
Date: Wed, 24 Nov 2021 22:23:01 +0000 (-0500)
Subject: cephadm: only infer conf from mon if fsid matches
X-Git-Tag: v16.2.8~273^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ef0c84777286d19a07acc6a1945023e0636bf74c;p=ceph.git

cephadm: only infer conf from mon if fsid matches

fixes: https://tracker.ceph.com/issues/53394

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit f64b8a34c4808af5f09ddc5de8085d78b50a9666)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 77542628c12c..d080c9b17051 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 5d45fdb40df4..3873c660924f 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,