osd: Return correct osd_objectstore in OSD metadata

Do not simply read the configuration value as it might have changed
during OSD startup by reading the type from disk.

Fixes: http://tracker.ceph.com/issues/18638
Signed-off-by: Wido den Hollander <wido@42on.com>
(cherry picked from commit 8fe6a0303b02ac1033f5bfced9f94350fe3e33de)

Conflicts:
    src/osd/OSD.cc
      - g_conf->osd_objectstore was changed to cct->_conf->osd_objectstore by
        1d5e967a05ddbcceb10efe3b57e242b3b6b7eb8c which is not in kraken

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 134b141f54200e4c3632140651b48ae57485b5ba..052aa5fce3bab6316ae400cd5ec244ba2f761103 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -5111,7 +5111,7 @@ void OSD::_collect_metadata(map<string,string> *pm)
   (*pm)["hb_back_addr"] = stringify(hb_back_server_messenger->get_myaddr());
 
   // backend
-  (*pm)["osd_objectstore"] = g_conf->osd_objectstore;
+  (*pm)["osd_objectstore"] = store->get_type();
   store->collect_metadata(pm);
 
   collect_sys_info(pm, g_ceph_context);