From 582b39eb681b8b601841c9ee98d0d66b0ee04894 Mon Sep 17 00:00:00 2001 From: songbaisen Date: Thu, 9 Mar 2017 19:36:40 +0800 Subject: [PATCH] osd: check fsid is normal before osd mkfs Signed-off-by: song baisen --- src/ceph_osd.cc | 5 +++++ src/osd/OSD.cc | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc index 3565e249679..eba88a86bed 100644 --- a/src/ceph_osd.cc +++ b/src/ceph_osd.cc @@ -268,6 +268,11 @@ int main(int argc, const char **argv) if (mc.get_monmap_privately() < 0) return -1; + if (mc.monmap.fsid.is_zero()) { + derr << "must specify cluster fsid" << dendl; + return -EINVAL; + } + int err = OSD::mkfs(g_ceph_context, store, g_conf->osd_data, mc.monmap.fsid, whoami); if (err < 0) { diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 2ac89d559fb..8589df9cc8e 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -1531,12 +1531,6 @@ int OSD::mkfs(CephContext *cct, ObjectStore *store, const string &dev, } } 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; -- 2.39.5