qa/workunits/snaps: New allow_new_snaps syntax

These were probably just obscuring other failures.

Reviewed-by: Sage Weil <sage@inktank.com>
Signed-off-by: John Spray <john.spray@inktank.com>

diff --git a/qa/workunits/snaps/snap-rm-diff.sh b/qa/workunits/snaps/snap-rm-diff.sh
index 3d30dc7937a57c2a2ee4c3dae2cdbe616ff80161..0271767b80a5a44c36bc1ea655544f0e4bfb0a85 100755 (executable)
--- 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 366249e7d2540862ceca7e9177c90f663e6932f5..6ce26044bac917075459665864bd44d8863194c0 100755 (executable)
--- 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 7c528dd432a08d89bacce0d7ed85b480cd263371..f8fb61498c2dcf8bf81bb8a5c8bc052f0017af5a 100755 (executable)
--- 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 b73bf9cb97f2454678ab1a670349697d3960a072..b2458d9b289270426595b1817c8cadbbe4088e41 100755 (executable)
--- 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 acbb599bda97d5b6ac00352177874614e566fed8..9dd98458f6be3ad3e74948c71473b8bc397d5e18 100755 (executable)
--- 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 9d0568cb6dbe1e57a28ada0267284cfea2a73c24..3b6a01a44f65e7ca661877fcbb34bfe1942568f2 100755 (executable)
--- 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 6995f537a47652f8874d41f78b5ec14450d6b498..b98358a48e360d06e2917b6ab84317907596ef1a 100755 (executable)
--- 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 5a673ff9c0dfca2e46fb90d843d6ad26a1b3d9d7..b5472138781488206263b8e46ad0529c87307f42 100755 (executable)
--- 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 31ba5a876592d87fe3367c3028ba9749412c690e..1465a35682f7f7ca1eede8753bf3f5d707acb316 100755 (executable)
--- 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 71a71e1d4696ad5776861e5e4b155f6bfef52f42..f06280aefab352f5911d0a0d251223b0383f811d 100755 (executable)
--- 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 d022cfd479e2a0abcb523c2aa3266c53b1e8aeed..729baa1dc56ce476d23259d318f37d97a01996fe 100755 (executable)
--- 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 d88722bde09094572745daa393eff4b8497d0382..bc58bac35b4ed720a08818904f42f5da2776db46 100755 (executable)
--- 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 8963f628dc862b93263cc125dd6af0638c4f8229..1310b45fe37557e716b46be266f9da3464ec14fc 100644 (file)
--- 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 68ecf37b73e6e8c80ae6d786544037815ef1172f..2b5e4a2dcf10bcf886ac6f4dbeae5063a142d7b5 100755 (executable)
--- 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 b5b8830e9f02ba672ad869c5ce17c2bf92aa8a09..64a99ea0ecc46e824109dadda2bc3e115770f2b0 100755 (executable)
--- 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 c36e2575845518cd30431d523c869c2c21538e94..af28b6379170354b94c1be79935b7f67b00af3d4 100755 (executable)
--- 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 89e2db0cd1015ef80c4cfd07ac2d5f83f207a6b2..d684bf421d45e5d6c63127d418c30c71616cb514 100755 (executable)
--- 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