]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: skip blank device ids
authorSage Weil <sage@redhat.com>
Wed, 6 Jun 2018 13:46:10 +0000 (08:46 -0500)
committerSage Weil <sage@redhat.com>
Mon, 11 Jun 2018 12:29:04 +0000 (07:29 -0500)
Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/OSD.cc

index 80d5bd6b689581df75455b6c1d9781e528893cdf..c6087d2d0e9c6e767ebfa626065db9f632f49908 100644 (file)
@@ -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;