From: Yan, Zheng <zyan@redhat.com>
Date: Tue, 17 Apr 2018 08:21:18 +0000 (+0800)
Subject: mds: allow snapshot by default for new filesystem
X-Git-Tag: v13.1.0~2^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=81d0554e5d29145cf15eeb849515911f2c75095a;p=ceph.git

mds: allow snapshot by default for new filesystem

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Fixes: http://tracker.ceph.com/issues/23623
---

diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h
index 7e3fe651fa91..b6019b857df6 100644
--- a/src/include/ceph_fs.h
+++ b/src/include/ceph_fs.h
@@ -239,7 +239,8 @@ struct ceph_mon_subscribe_ack {
 #define CEPH_MDSMAP_ALLOW_MULTIMDS_SNAPS	 (1<<4)  /* cluster alllowed to enable MULTIMDS
 							    and SNAPS at the same time */
 
-#define CEPH_MDSMAP_DEFAULTS CEPH_MDSMAP_ALLOW_MULTIMDS_SNAPS
+#define CEPH_MDSMAP_DEFAULTS (CEPH_MDSMAP_ALLOW_SNAPS | \
+			      CEPH_MDSMAP_ALLOW_MULTIMDS_SNAPS)
 
 /*
  * mds states
diff --git a/src/mon/FSCommands.cc b/src/mon/FSCommands.cc
index 054dd8beb88c..5c7d635dc0f9 100644
--- a/src/mon/FSCommands.cc
+++ b/src/mon/FSCommands.cc
@@ -361,12 +361,6 @@ public:
         });
 	ss << "disabled new snapshots";
       } else {
-	string confirm;
-	if (!cmd_getval(g_ceph_context, cmdmap, "confirm", confirm) ||
-	    confirm != "--yes-i-really-mean-it") {
-	  ss << EXPERIMENTAL_WARNING;
-	  return -EPERM;
-	}
         fsmap.modify_filesystem(
             fs->fscid,
             [](std::shared_ptr<Filesystem> fs)