From: Kefu Chai <kchai@redhat.com>
Date: Sun, 17 Jan 2021 08:29:37 +0000 (+0800)
Subject: mgr/rook: handle the case where given osd is not found
X-Git-Tag: v16.2.0~230^2~28
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=198acf49306459e5ef2ded29b4f64f97ff2e95db;p=ceph.git

mgr/rook: handle the case where given osd is not found

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 5272748e179f67c8d5464d3b38e96eb8829b6b00)
---

diff --git a/src/pybind/mgr/rook/module.py b/src/pybind/mgr/rook/module.py
index 101b97a7a26..c6a6293b4d5 100644
--- a/src/pybind/mgr/rook/module.py
+++ b/src/pybind/mgr/rook/module.py
@@ -570,7 +570,7 @@ class RookOrchestrator(MgrModule, orchestrator.Orchestrator):
                     found.append(osd_id)
                 else:
                     self.log.info("ignoring osd {0} {1}".format(
-                        osd_id, metadata['devices']
+                        osd_id, metadata['devices'] if metadata else 'DNE'
                     ))
 
             return found is not None