From 071f111abbd7d6c7a90fc58f52c84907cf4d9860 Mon Sep 17 00:00:00 2001 From: Wido den Hollander Date: Mon, 23 Jan 2017 21:06:05 +0100 Subject: [PATCH] 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 (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 --- src/osd/OSD.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 134b141f54200..052aa5fce3bab 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -5111,7 +5111,7 @@ void OSD::_collect_metadata(map *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); -- 2.39.5