mon: favor 'mds set max_mds' over 'mds set_max_mds'

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/doc/rados/operations/control.rst b/doc/rados/operations/control.rst
index ecdea6d8cc61eb27e8e56d47a27e57d24ded7ecd..2fbb82a5e252f9deda238797e02645f9b64734fd 100644 (file)
--- a/doc/rados/operations/control.rst
+++ b/doc/rados/operations/control.rst
@@ -301,7 +301,7 @@ Displays the status of all metadata servers.
 
 Marks the active MDS as failed, triggering failover to a stadnby if present.
 
-.. todo:: ``ceph mds`` subcommands missing docs: set_max_mds, dump, getmap, stop, setmap
+.. todo:: ``ceph mds`` subcommands missing docs: set, dump, getmap, stop, setmap
 
 
 Mon Subsystem

diff --git a/qa/workunits/rest/test.py b/qa/workunits/rest/test.py
index 178d3bf9cdff582d044a6c67f991a39f76b73739..dbe5961f19c0c9e27d30b2378120a62623bb8ae4 100755 (executable)
--- a/qa/workunits/rest/test.py
+++ b/qa/workunits/rest/test.py
@@ -206,6 +206,8 @@ if __name__ == '__main__':
     assert(r.myjson['output']['max_mds'] == 4)
     expect('mds/set_max_mds?maxmds=3', 'PUT', 200, '')
     r = expect('mds/stat.json', 'GET', 200, 'json')
+    expect('mds/set?var=max_mds?maxmds=2', 'PUT', 200, '')
+    r = expect('mds/stat.json', 'GET', 200, 'json')
     assert('info' in r.myjson['output']['mdsmap'])
     r = expect('mds/stat.xml', 'GET', 200, 'xml')
     assert(r.tree.find('output/mds_stat/mdsmap/info') is not None)

diff --git a/src/vstart.sh b/src/vstart.sh
index 8bdcec17d851dcc3b59dab4c87995830d5d453a4..9c76c539b5df85d9265d3f3b2d96304b8936908b 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -520,9 +520,9 @@ EOF
 
 #valgrind --tool=massif $CEPH_BIN/ceph-mds $ARGS --mds_log_max_segments 2 --mds_thrash_fragments 0 --mds_thrash_exports 0 > m  #--debug_ms 20
 #$CEPH_BIN/ceph-mds -d $ARGS --mds_thrash_fragments 0 --mds_thrash_exports 0 #--debug_ms 20
-#$CEPH_ADM mds set_max_mds 2
+#$CEPH_ADM mds set max_mds 2
     done
-    cmd="$CEPH_ADM mds set_max_mds $CEPH_NUM_MDS"
+    cmd="$CEPH_ADM mds set max_mds $CEPH_NUM_MDS"
     echo $cmd
     $cmd
 fi