From 2b36761b813fa828948cf5a40e1bcf7eea8f677a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 14 Jan 2014 22:07:24 -0800 Subject: [PATCH] mon: favor 'mds set max_mds' over 'mds set_max_mds' Signed-off-by: Sage Weil --- doc/rados/operations/control.rst | 2 +- qa/workunits/rest/test.py | 2 ++ src/vstart.sh | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/rados/operations/control.rst b/doc/rados/operations/control.rst index ecdea6d8cc6..2fbb82a5e25 100644 --- 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 178d3bf9cdf..dbe5961f19c 100755 --- 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 8bdcec17d85..9c76c539b5d 100755 --- 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 -- 2.47.3