From: songbaisen <song.baisen@zte.com.cn>
Date: Thu, 9 Mar 2017 11:36:40 +0000 (+0800)
Subject: osd: check fsid is normal before osd mkfs
X-Git-Tag: v12.0.3~281^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F13898%2Fhead;p=ceph.git

osd: check fsid is normal before osd mkfs

Signed-off-by: song baisen <song.baisen@zte.com.cn>
---

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index 3565e2496798..eba88a86bedf 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 2ac89d559fb2..8589df9cc8e8 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;