test: update tests for new flag requirements

Signed-off-by: Greg Farnum <gfarnum@redhat.com>

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index 4af465f95f54678a8c45e280291698a8ce408e8c..64e7f301a9d03ee49e0c8ae29c917911cb4d9d1c 100755 (executable)
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -814,6 +814,8 @@ function test_mon_mds()
   ceph mds remove_data_pool $data3_pool
   ceph osd pool delete data2 data2 --yes-i-really-really-mean-it
   ceph osd pool delete data3 data3 --yes-i-really-really-mean-it
+  expect_false ceph mds set_max_mds 4
+  ceph mds set allow_multimds true --yes-i-really-mean-it
   ceph mds set_max_mds 4
   ceph mds set_max_mds 3
   ceph mds set_max_mds 256
@@ -875,7 +877,7 @@ function test_mon_mds()
   set -e
 
   # Check that setting enable_multiple enables creation of second fs
-  ceph fs flag set enable_multiple true
+  ceph fs flag set enable_multiple true --yes-i-really-mean-it
   ceph fs new cephfs2 fs_metadata2 fs_data2
 
   # Clean up multi-fs stuff

diff --git a/qa/workunits/rest/test.py b/qa/workunits/rest/test.py
index fb633c0eeb220af9efa48affbd54b249efb0b34b..34f7a352731a5f375ef1bb516a82a6ef68912759 100755 (executable)
--- a/qa/workunits/rest/test.py
+++ b/qa/workunits/rest/test.py
@@ -183,6 +183,7 @@ if __name__ == '__main__':
     expect('mds/remove_data_pool?pool={0}'.format(poolnum), 'PUT', 200, '')
     expect('osd/pool/delete?pool=data2&pool2=data2'
            '&sure=--yes-i-really-really-mean-it', 'PUT', 200, '')
+    expect('mds/set?var=allow_multimds&val=true&confirm=--yes-i-really-mean-it', 'PUT', 200, '')
     expect('mds/set_max_mds?maxmds=4', 'PUT', 200, '')
     expect('mds/set?var=max_mds&val=4', 'PUT', 200, '')
     expect('mds/set?var=max_file_size&val=1048576', 'PUT', 200, '')

diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index 45227f2d4ea3f6d4a777c78197753906792449b1..7c63832485802630108c30c9482df5c7aacd75df 100644 (file)
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -329,7 +329,8 @@ COMMAND("mds set_max_mds " \
        "name=maxmds,type=CephInt,range=0", \
        "set max MDS index", "mds", "rw", "cli,rest")
 COMMAND("mds set " \
-       "name=var,type=CephChoices,strings=max_mds|max_file_size|allow_new_snaps|inline_data " \
+       "name=var,type=CephChoices,strings=max_mds|max_file_size"
+       "|allow_new_snaps|inline_data|allow_multimds|allow_dirfrags " \
        "name=val,type=CephString "                                     \
        "name=confirm,type=CephString,req=false",                       \
        "set mds parameter <var> to <val>", "mds", "rw", "cli,rest")
@@ -397,7 +398,7 @@ COMMAND("fs get name=fs_name,type=CephString", \
 COMMAND("fs set " \
        "name=fs_name,type=CephString " \
        "name=var,type=CephChoices,strings=max_mds|max_file_size"
-        "|allow_new_snaps|inline_data|cluster_down " \
+        "|allow_new_snaps|inline_data|cluster_down|allow_multimds|allow_dirfrags " \
        "name=val,type=CephString "                                     \
        "name=confirm,type=CephString,req=false",                       \
        "set mds parameter <var> to <val>", "mds", "rw", "cli,rest")

diff --git a/src/vstart.sh b/src/vstart.sh
index c81a793245a299ba8c395ad0c987261ef32ce487..9d225efb5358d046fddb523dda866aea4ca4eaef 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -625,7 +625,7 @@ fi
 
 if [ "$start_mds" -eq 1 -a "$CEPH_NUM_MDS" -gt 0 ]; then
     if [ "$CEPH_NUM_FS" -gt "1" ] ; then
-        $CEPH_ADM fs flag set enable_multiple true
+        $CEPH_ADM fs flag set enable_multiple true --yes-i-really-mean-it
     fi
 
     fs=0