From: Sage Weil <sage@redhat.com>
Date: Wed, 6 Jun 2018 13:46:10 +0000 (-0500)
Subject: osd: skip blank device ids
X-Git-Tag: v14.0.1~1131^2~9
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=bab66065eb0c7d594fca247b261e80eb84d4470d;p=ceph.git

osd: skip blank device ids

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 80d5bd6b68958..c6087d2d0e9c6 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -5422,7 +5422,12 @@ void OSD::_collect_metadata(map<string,string> *pm)
     if (!devids.empty()) {
       devids += ",";
     }
-    devids += dev + "=" + get_device_id(dev);
+    string id = get_device_id(dev);
+    if (id.size()) {
+      devids += dev + "=" + id;
+    } else {
+      dout(10) << __func__ << " no unique device id for " << dev << dendl;
+    }
   }
   (*pm)["device_ids"] = devids;