From 072c41e3492a13525d2a45465ed580fc1426fbd1 Mon Sep 17 00:00:00 2001 From: John Spray Date: Tue, 21 Mar 2017 12:04:39 -0400 Subject: [PATCH] mon: mark newfs with OBSOLETE flag + remove the explicit handler for it. Signed-off-by: John Spray --- src/mon/MDSMonitor.cc | 9 --------- src/mon/MonCommands.h | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc index 3b752e39cf9..ea354af2e04 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 5a5dcb61d29..a9592f8952f 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 and ", \ - "mds", "rw", "cli,rest", FLAG(DEPRECATED)) + "mds", "rw", "cli,rest", FLAG(OBSOLETE)) COMMAND("fs new " \ "name=fs_name,type=CephString " \ "name=metadata,type=CephString " \ -- 2.39.5