From: Sage Weil <sage@redhat.com>
Date: Tue, 15 Mar 2016 13:44:13 +0000 (-0400)
Subject: qa/workunits: remove 'mds setmap' from workunits
X-Git-Tag: v10.1.0~37^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6a80e2df8b31802a39ef6f89136ed357dce50c20;p=ceph.git

qa/workunits: remove 'mds setmap' from workunits

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

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index 6f439c888b88..6081d817811f 100755
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -793,20 +793,6 @@ function test_mon_mds()
   mdsmapfile=$TMPDIR/mdsmap.$$
   current_epoch=$(ceph mds getmap -o $mdsmapfile --no-log-to-stderr 2>&1 | grep epoch | sed 's/.*epoch //')
   [ -s $mdsmapfile ]
-  # make several attempts in case we race with another mdsmap update
-  ((epoch = current_epoch + 1))
-  ((epoch2 = current_epoch + 2))
-  ((epoch3 = current_epoch + 3))
-  ((epoch4 = current_epoch + 4))
-  # no conformation
-  expect_false ceph mds setmap -i $mdsmapfile $epoch
-  # no input
-  expect_false ceph mds setmap $epoch --yes-i-really-mean-it
-
-  ceph mds setmap -i $mdsmapfile $epoch --yes-i-really-mean-it || \
-      ceph mds setmap -i $mdsmapfile $epoch2 --yes-i-really-mean-it || \
-      ceph mds setmap -i $mdsmapfile $epoch3 --yes-i-really-mean-it || \
-      ceph mds setmap -i $mdsmapfile $epoch4 --yes-i-really-mean-it
   rm $mdsmapfile
 
   ceph osd pool create data2 10
diff --git a/qa/workunits/rest/test.py b/qa/workunits/rest/test.py
index 5dc7f6a1f761..1d20d7c09c9f 100755
--- a/qa/workunits/rest/test.py
+++ b/qa/workunits/rest/test.py
@@ -166,26 +166,6 @@ if __name__ == '__main__':
     r = expect('mds/dump.xml', 'GET', 200, 'xml')
     assert(r.tree.find('output/mdsmap/created') is not None)
 
-    failresps = []
-    while len(failresps) < 10:
-        r = expect('mds/dump.json', 'GET', 200, 'json')
-        assert('created' in r.myjson['output'])
-        current_epoch = r.myjson['output']['epoch']
-
-        map = expect('mds/getmap', 'GET', 200, '')
-        assert(len(map.content) != 0)
-        msg, r = expect_nofail(
-            'mds/setmap?epoch={0}&confirm=--yes-i-really-mean-it'.format(current_epoch + 1), 'PUT', 200,
-            'plain', {'Content-Type':'text/plain'}, data=map.content
-            )
-        if msg:
-            failresps.append(msg + r.content)
-        else:
-            break
-
-    if len(failresps) == 10:
-        fail(r, 'Could not mds setmap in 10 tries; responses:' +
-             '\n'.join(failresps))
     expect('mds/newfs?metadata=0&data=1&sure=--yes-i-really-mean-it', 'PUT',
            200, '')
     expect('osd/pool/create?pool=data2&pg_num=10', 'PUT', 200, '')