mon: Abort device health when device not found

If `store->get_devname()` returns an empty device name, it means it couldn't
determine the device that backs the monitor DB store directory.

This can happen if `ceph-mon` runs with `PrivateDevices=yes` in systemd, or
within a container where the host `/dev` isn't exposed.

This commit makes sure we abort trying to get the device health at that point,
and return an appropriate error.

Signed-off-by: Benoît Knecht <bknecht@protonmail.ch>
(cherry picked from commit c05a3b769dccf5fe839a2150e39d899516469164)

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 3f2e2dc036663ac1ca1e81bf0d7a001127c51a42..60eef578c64fd517790672582fe7c15fd33d3432 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -417,6 +417,11 @@ int Monitor::do_admin_command(
     cmd_getval(cmdmap, "devid", want_devid);
 
     string devname = store->get_devname();
+    if (devname.empty()) {
+      err << "could not determine device name for " << store->get_path();
+      r = -ENOENT;
+      goto abort;
+    }
     set<string> devnames;
     get_raw_devices(devname, &devnames);
     json_spirit::mObject json_map;

diff --git a/src/mon/MonitorDBStore.h b/src/mon/MonitorDBStore.h
index 515a047279781743cd638611875c9de5825bd16a..c33d35e486d4424d1bd3f057a1d0d4816aa59255 100644 (file)
--- a/src/mon/MonitorDBStore.h
+++ b/src/mon/MonitorDBStore.h
@@ -57,6 +57,10 @@ class MonitorDBStore
     return devname;
   }
 
+  std::string get_path() {
+    return path;
+  }
+
   std::shared_ptr<PriorityCache::PriCache> get_priority_cache() const {
     return db->get_priority_cache();
   }