From: Yanhu Cao <gmayyyha@gmail.com>
Date: Tue, 1 Aug 2017 02:44:57 +0000 (+0800)
Subject: ceph-osd: fix auto detect which objectstore is currently running
X-Git-Tag: v12.1.3~24^2~12^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ce7fed2926dc6498196f635727caac2ae78611be;p=ceph.git

ceph-osd: fix auto detect which objectstore is currently running

Fixes: http://tracker.ceph.com/issues/20865

Signed-off-by: Yanhu Cao <gmayyyha@gmail.com>
---

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index f3d585b47759..91a750a0a476 100644
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -246,6 +246,7 @@ int main(int argc, const char **argv)
       bl.read_fd(fd, 64);
       if (bl.length()) {
 	store_type = string(bl.c_str(), bl.length() - 1);  // drop \n
+	g_conf->set_val("osd_objectstore", store_type);
 	dout(5) << "object store type is " << store_type << dendl;
       }
       ::close(fd);