From ce0e3bd1880bfb2f05e8425d96c87d555891742a Mon Sep 17 00:00:00 2001 From: John Spray Date: Wed, 5 Feb 2014 18:44:40 +0000 Subject: [PATCH] qa/workunits/snaps: New allow_new_snaps syntax These were probably just obscuring other failures. Reviewed-by: Sage Weil Signed-off-by: John Spray --- qa/workunits/snaps/snap-rm-diff.sh | 2 +- qa/workunits/snaps/snaptest-0.sh | 6 +++--- qa/workunits/snaps/snaptest-1.sh | 2 +- qa/workunits/snaps/snaptest-2.sh | 2 +- qa/workunits/snaps/snaptest-authwb.sh | 2 +- qa/workunits/snaps/snaptest-capwb.sh | 2 +- qa/workunits/snaps/snaptest-dir-rename.sh | 2 +- qa/workunits/snaps/snaptest-double-null.sh | 2 +- qa/workunits/snaps/snaptest-estale.sh | 2 +- qa/workunits/snaps/snaptest-git-ceph.sh | 2 +- qa/workunits/snaps/snaptest-intodir.sh | 2 +- qa/workunits/snaps/snaptest-multiple-capsnaps.sh | 2 +- qa/workunits/snaps/snaptest-parents.sh | 2 +- qa/workunits/snaps/snaptest-snap-rm-cmp.sh | 2 +- qa/workunits/snaps/snaptest-upchildrealms.sh | 2 +- qa/workunits/snaps/snaptest-xattrwb.sh | 2 +- qa/workunits/snaps/untar_snap_rm.sh | 2 +- 17 files changed, 19 insertions(+), 19 deletions(-) diff --git a/qa/workunits/snaps/snap-rm-diff.sh b/qa/workunits/snaps/snap-rm-diff.sh index 3d30dc7937a57..0271767b80a5a 100755 --- a/qa/workunits/snaps/snap-rm-diff.sh +++ b/qa/workunits/snaps/snap-rm-diff.sh @@ -1,6 +1,6 @@ #!/bin/sh -ex -ceph mds set allow_new_snaps --yes-i-really-mean-it +ceph mds set allow_new_snaps true --yes-i-really-mean-it wget -q http://ceph.com/qa/linux-2.6.33.tar.bz2 mkdir foo cp linux* foo diff --git a/qa/workunits/snaps/snaptest-0.sh b/qa/workunits/snaps/snaptest-0.sh index 366249e7d2540..6ce26044bac91 100755 --- a/qa/workunits/snaps/snaptest-0.sh +++ b/qa/workunits/snaps/snaptest-0.sh @@ -9,7 +9,7 @@ expect_failure() { set -e expect_failure mkdir .snap/foo -ceph mds set allow_new_snaps --yes-i-really-mean-it +ceph mds set allow_new_snaps true --yes-i-really-mean-it echo asdf > foo mkdir .snap/foo @@ -23,7 +23,7 @@ grep asdf .snap/bar/bar rmdir .snap/bar rm foo -ceph mds unset allow_new_snaps --yes-i-really-mean-it +ceph mds set allow_new_snaps false expect_failure mkdir .snap/baz -echo OK \ No newline at end of file +echo OK diff --git a/qa/workunits/snaps/snaptest-1.sh b/qa/workunits/snaps/snaptest-1.sh index 7c528dd432a08..f8fb61498c2dc 100755 --- a/qa/workunits/snaps/snaptest-1.sh +++ b/qa/workunits/snaps/snaptest-1.sh @@ -2,7 +2,7 @@ set -e -ceph mds set allow_new_snaps --yes-i-really-mean-it +ceph mds set allow_new_snaps true --yes-i-really-mean-it echo 1 > file1 echo 2 > file2 diff --git a/qa/workunits/snaps/snaptest-2.sh b/qa/workunits/snaps/snaptest-2.sh index b73bf9cb97f24..b2458d9b28927 100755 --- a/qa/workunits/snaps/snaptest-2.sh +++ b/qa/workunits/snaps/snaptest-2.sh @@ -1,6 +1,6 @@ #!/bin/bash -ceph mds set allow_new_snaps --yes-i-really-mean-it +ceph mds set allow_new_snaps true --yes-i-really-mean-it echo "Create dir 100 to 199 ..." for i in $(seq 100 199); do diff --git a/qa/workunits/snaps/snaptest-authwb.sh b/qa/workunits/snaps/snaptest-authwb.sh index acbb599bda97d..9dd98458f6be3 100755 --- a/qa/workunits/snaps/snaptest-authwb.sh +++ b/qa/workunits/snaps/snaptest-authwb.sh @@ -2,7 +2,7 @@ set -e -ceph mds set allow_new_snaps --yes-i-really-mean-it +ceph mds set allow_new_snaps true --yes-i-really-mean-it touch foo chmod +x foo diff --git a/qa/workunits/snaps/snaptest-capwb.sh b/qa/workunits/snaps/snaptest-capwb.sh index 9d0568cb6dbe1..3b6a01a44f65e 100755 --- a/qa/workunits/snaps/snaptest-capwb.sh +++ b/qa/workunits/snaps/snaptest-capwb.sh @@ -4,7 +4,7 @@ set -e mkdir foo -ceph mds set allow_new_snaps --yes-i-really-mean-it +ceph mds set allow_new_snaps true --yes-i-really-mean-it # make sure mds handles it when the client does not send flushsnap echo x > foo/x diff --git a/qa/workunits/snaps/snaptest-dir-rename.sh b/qa/workunits/snaps/snaptest-dir-rename.sh index 6995f537a4765..b98358a48e360 100755 --- a/qa/workunits/snaps/snaptest-dir-rename.sh +++ b/qa/workunits/snaps/snaptest-dir-rename.sh @@ -2,7 +2,7 @@ set -e -ceph mds set allow_new_snaps --yes-i-really-mean-it +ceph mds set allow_new_snaps true --yes-i-really-mean-it # # make sure we keep an existing dn's seq diff --git a/qa/workunits/snaps/snaptest-double-null.sh b/qa/workunits/snaps/snaptest-double-null.sh index 5a673ff9c0dfc..b547213878148 100755 --- a/qa/workunits/snaps/snaptest-double-null.sh +++ b/qa/workunits/snaps/snaptest-double-null.sh @@ -2,7 +2,7 @@ set -e -ceph mds set allow_new_snaps --yes-i-really-mean-it +ceph mds set allow_new_snaps true --yes-i-really-mean-it # multiple intervening snapshots with no modifications, and thus no # snapflush client_caps messages. make sure the mds can handle this. diff --git a/qa/workunits/snaps/snaptest-estale.sh b/qa/workunits/snaps/snaptest-estale.sh index 31ba5a876592d..1465a35682f7f 100755 --- a/qa/workunits/snaps/snaptest-estale.sh +++ b/qa/workunits/snaps/snaptest-estale.sh @@ -1,6 +1,6 @@ #!/bin/sh -x -ceph mds set allow_new_snaps --yes-i-really-mean-it +ceph mds set allow_new_snaps true --yes-i-really-mean-it mkdir .snap/foo diff --git a/qa/workunits/snaps/snaptest-git-ceph.sh b/qa/workunits/snaps/snaptest-git-ceph.sh index 71a71e1d4696a..f06280aefab35 100755 --- a/qa/workunits/snaps/snaptest-git-ceph.sh +++ b/qa/workunits/snaps/snaptest-git-ceph.sh @@ -2,7 +2,7 @@ set -e -ceph mds set allow_new_snaps --yes-i-really-mean-it +ceph mds set allow_new_snaps true --yes-i-really-mean-it git clone git://ceph.com/git/ceph.git cd ceph diff --git a/qa/workunits/snaps/snaptest-intodir.sh b/qa/workunits/snaps/snaptest-intodir.sh index d022cfd479e2a..729baa1dc56ce 100755 --- a/qa/workunits/snaps/snaptest-intodir.sh +++ b/qa/workunits/snaps/snaptest-intodir.sh @@ -1,6 +1,6 @@ #!/bin/sh -ex -ceph mds set allow_new_snaps --yes-i-really-mean-it +ceph mds set allow_new_snaps true --yes-i-really-mean-it # this tests fix for #1399 mkdir foo diff --git a/qa/workunits/snaps/snaptest-multiple-capsnaps.sh b/qa/workunits/snaps/snaptest-multiple-capsnaps.sh index d88722bde0909..bc58bac35b4ed 100755 --- a/qa/workunits/snaps/snaptest-multiple-capsnaps.sh +++ b/qa/workunits/snaps/snaptest-multiple-capsnaps.sh @@ -2,7 +2,7 @@ set -e -ceph mds set allow_new_snaps --yes-i-really-mean-it +ceph mds set allow_new_snaps true --yes-i-really-mean-it echo asdf > a mkdir .snap/1 diff --git a/qa/workunits/snaps/snaptest-parents.sh b/qa/workunits/snaps/snaptest-parents.sh index 8963f628dc862..1310b45fe3755 100644 --- a/qa/workunits/snaps/snaptest-parents.sh +++ b/qa/workunits/snaps/snaptest-parents.sh @@ -2,7 +2,7 @@ set -e -ceph mds set allow_new_snaps --yes-i-really-mean-it +ceph mds set allow_new_snaps true --yes-i-really-mean-it echo "making directory tree and files" mkdir -p 1/a/b/c/ diff --git a/qa/workunits/snaps/snaptest-snap-rm-cmp.sh b/qa/workunits/snaps/snaptest-snap-rm-cmp.sh index 68ecf37b73e6e..2b5e4a2dcf10b 100755 --- a/qa/workunits/snaps/snaptest-snap-rm-cmp.sh +++ b/qa/workunits/snaps/snaptest-snap-rm-cmp.sh @@ -2,7 +2,7 @@ set -e -ceph mds set allow_new_snaps --yes-i-really-mean-it +ceph mds set allow_new_snaps true --yes-i-really-mean-it file=linux-2.6.33.tar.bz2 wget -q http://ceph.com/qa/$file diff --git a/qa/workunits/snaps/snaptest-upchildrealms.sh b/qa/workunits/snaps/snaptest-upchildrealms.sh index b5b8830e9f02b..64a99ea0ecc46 100755 --- a/qa/workunits/snaps/snaptest-upchildrealms.sh +++ b/qa/workunits/snaps/snaptest-upchildrealms.sh @@ -2,7 +2,7 @@ set -e -ceph mds set allow_new_snaps --yes-i-really-mean-it +ceph mds set allow_new_snaps true --yes-i-really-mean-it # # verify that a snap update on a parent realm will induce diff --git a/qa/workunits/snaps/snaptest-xattrwb.sh b/qa/workunits/snaps/snaptest-xattrwb.sh index c36e257584551..af28b63791703 100755 --- a/qa/workunits/snaps/snaptest-xattrwb.sh +++ b/qa/workunits/snaps/snaptest-xattrwb.sh @@ -2,7 +2,7 @@ set -e -ceph mds set allow_new_snaps --yes-i-really-mean-it +ceph mds set allow_new_snaps true --yes-i-really-mean-it echo "testing simple xattr wb" touch x diff --git a/qa/workunits/snaps/untar_snap_rm.sh b/qa/workunits/snaps/untar_snap_rm.sh index 89e2db0cd1015..d684bf421d45e 100755 --- a/qa/workunits/snaps/untar_snap_rm.sh +++ b/qa/workunits/snaps/untar_snap_rm.sh @@ -2,7 +2,7 @@ set -e -ceph mds set allow_new_snaps --yes-i-really-mean-it +ceph mds set allow_new_snaps true --yes-i-really-mean-it do_tarball() { wget http://ceph.com/qa/$1 -- 2.39.5