]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/OSD: filter out deprecated meta for bluestore
authorxie xingguo <xie.xingguo@zte.com.cn>
Thu, 13 Jul 2017 07:38:23 +0000 (15:38 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Mon, 17 Jul 2017 13:49:42 +0000 (21:49 +0800)
Journal path is filestore related...

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
src/osd/OSD.cc

index eeb5bc5d8480ae561ce31171c5fd3c05e19a52d9..7520ade61e17cb50f16e2ea98535123691a0bab6 100644 (file)
@@ -5781,7 +5781,10 @@ void OSD::_collect_metadata(map<string,string> *pm)
 {
   // config info
   (*pm)["osd_data"] = dev_path;
-  (*pm)["osd_journal"] = journal_path;
+  if (store->get_type() == "filestore") {
+    // not applicable for bluestore
+    (*pm)["osd_journal"] = journal_path;
+  }
   (*pm)["front_addr"] = stringify(client_messenger->get_myaddr());
   (*pm)["back_addr"] = stringify(cluster_messenger->get_myaddr());
   (*pm)["hb_front_addr"] = stringify(hb_front_server_messenger->get_myaddr());