From: Wido den Hollander <wido@42on.com>
Date: Mon, 23 Jan 2017 20:06:05 +0000 (+0100)
Subject: osd: Return correct osd_objectstore in OSD metadata
X-Git-Tag: v12.0.0~100^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F13072%2Fhead;p=ceph.git

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>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 31c84a5358122..c3beb379cf3ad 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -5115,7 +5115,7 @@ void OSD::_collect_metadata(map<string,string> *pm)
   (*pm)["hb_back_addr"] = stringify(hb_back_server_messenger->get_myaddr());
 
   // backend
-  (*pm)["osd_objectstore"] = cct->_conf->osd_objectstore;
+  (*pm)["osd_objectstore"] = store->get_type();
   store->collect_metadata(pm);
 
   collect_sys_info(pm, cct);