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 7e3fe651fa918908508791ec5eeef469e71550b6..b6019b857df659fcd7fec376f9b6fe0a26088fb4 100644 (file)
--- 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 054dd8beb88c04a2fd5f407613b1cb3632c96d5c..5c7d635dc0f962aa44ce41058dfd97d1019269d5 100644 (file)
--- 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)