From: John Spray <john.spray@redhat.com>
Date: Tue, 21 Mar 2017 16:04:39 +0000 (-0400)
Subject: mon: mark newfs with OBSOLETE flag
X-Git-Tag: v12.0.2~293^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F14015%2Fhead;p=ceph.git

mon: mark newfs with OBSOLETE flag

+ remove the explicit handler for it.

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 3b752e39cf9a..ea354af2e044 100644
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -1188,15 +1188,6 @@ bool MDSMonitor::prepare_command(MonOpRequestRef op)
     }
   }
 
-  if (prefix == "mds newfs") {
-    // newfs is the legacy command that in single-filesystem times
-    // used to be equivalent to doing an "fs rm ; fs new".  We
-    // can't do this in a sane way in multi-filesystem world.
-    ss << "'newfs' no longer available.  Please use 'fs new'.";
-    r = -EINVAL;
-    goto out;
-  } 
-
   r = filesystem_command(op, prefix, cmdmap, ss);
   if (r >= 0) {
     goto out;
diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index 5a5dcb61d29b..a9592f8952f4 100644
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -370,7 +370,7 @@ COMMAND_WITH_FLAG("mds newfs " \
 	"name=data,type=CephInt,range=0 " \
 	"name=sure,type=CephChoices,strings=--yes-i-really-mean-it,req=false", \
 	"make new filesystem using pools <metadata> and <data>", \
-	"mds", "rw", "cli,rest", FLAG(DEPRECATED))
+	"mds", "rw", "cli,rest", FLAG(OBSOLETE))
 COMMAND("fs new " \
 	"name=fs_name,type=CephString " \
 	"name=metadata,type=CephString " \