From: Sage Weil <sage@redhat.com>
Date: Mon, 4 Jun 2018 14:11:56 +0000 (-0500)
Subject: osd: include device_ids in metadata
X-Git-Tag: v14.0.1~1131^2~21
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=937c987eaf93342cb0707b377197bb5ef36d69da;p=ceph.git

osd: include device_ids in metadata

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index b23e88fa7538..80d5bd6b6895 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -48,6 +48,7 @@
 #include "common/version.h"
 #include "common/pick_address.h"
 #include "common/SubProcess.h"
+#include "common/blkdev.h"
 
 #include "os/ObjectStore.h"
 #ifdef HAVE_LIBFUSE
@@ -5416,6 +5417,14 @@ void OSD::_collect_metadata(map<string,string> *pm)
   set<string> devnames;
   store->get_devices(&devnames);
   (*pm)["devices"] = stringify(devnames);
+  string devids;
+  for (auto& dev : devnames) {
+    if (!devids.empty()) {
+      devids += ",";
+    }
+    devids += dev + "=" + get_device_id(dev);
+  }
+  (*pm)["device_ids"] = devids;
 
   dout(10) << __func__ << " " << *pm << dendl;
 }