mon/ConfigMonitor: update crush_location from osd entity

For osd entities, crush_location needs to refer to osd's parent
(host) so that 'ceph config set' using osd/host mask can work.

Fixes: https://tracker.ceph.com/issues/48750
Signed-off-by: Didier Gazen <didier.gazen@aero.obs-mip.fr>
(cherry picked from commit 5df2a597a5b90ed492b2cbc3599f2cfdababeb12)

diff --git a/src/mon/ConfigMonitor.cc b/src/mon/ConfigMonitor.cc
index c82a8417ab0eede45ee402e8c997c9f9a5c31729..1dd3747e73d0e808c22d0dcad55b720846d81960 100644 (file)
--- a/src/mon/ConfigMonitor.cc
+++ b/src/mon/ConfigMonitor.cc
@@ -932,6 +932,7 @@ bool ConfigMonitor::refresh_config(MonSession *s)
 
   string device_class;
   if (s->name.is_osd()) {
+    osdmap.crush->get_full_location(s->entity_name.to_str(), &crush_location);
     const char *c = osdmap.crush->get_item_class(s->name.num());
     if (c) {
       device_class = c;