From: Sage Weil <sage@newdream.net>
Date: Mon, 15 Mar 2021 22:20:25 +0000 (-0500)
Subject: mgr/cephadm: ensure mgr metadata is not none
X-Git-Tag: v16.2.0~106^2~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=074452449bd59f93d44221d4bc32482b92070936;p=ceph.git

mgr/cephadm: ensure mgr metadata is not none

This hunk is from aca45d7d08fd8c3f32849331eba4620e2726282a, a much
larger change in master that added type annotations all over the place.
It just brings src/pybind/mgr/cephadm fully in sync with master.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py
index b77dbc619a00..121cb3912ee7 100644
--- a/src/pybind/mgr/cephadm/serve.py
+++ b/src/pybind/mgr/cephadm/serve.py
@@ -410,7 +410,8 @@ class CephadmServe:
                     name = '%s.%s' % (s.get('type'), daemon_id)
                     if s.get('type') == 'rbd-mirror':
                         metadata = self.mgr.get_metadata(
-                            "rbd-mirror", daemon_id)
+                            "rbd-mirror", daemon_id, {})
+                        assert metadata is not None
                         try:
                             name = '%s.%s' % (s.get('type'), metadata['id'])
                         except (KeyError, TypeError):