osd: require cluster fsid for mkfs

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 39d14ab10542aae7aa8ef0b531d9c01b75203abb..7c7ba3d6a3560f2ae2224f07bbe950bb9da31649 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -307,6 +307,12 @@ int OSD::mkfs(const std::string &dev, const std::string &jdev, uuid_d fsid, int
       dout(0) << " have superblock" << dendl;
     } else {
       // create superblock
+      if (fsid.is_zero()) {
+       derr << "must specify cluster fsid" << dendl;
+       ret = -EINVAL;
+       goto umount_store;
+      }
+
       sb.cluster_fsid = fsid;
       sb.osd_fsid = store->get_fsid();
       sb.whoami = whoami;