From: Sage Weil Date: Mon, 27 Jun 2016 18:59:24 +0000 (-0700) Subject: qa/workunits/objectstore: fix test_fuse.sh X-Git-Tag: v11.0.1~278^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b6870a618bd5d98bc952aa3c09df1cc6bd77dbae;p=ceph.git qa/workunits/objectstore: fix test_fuse.sh We switched from @ to # a while back. Signed-off-by: Sage Weil --- diff --git a/qa/workunits/objectstore/test_fuse.sh b/qa/workunits/objectstore/test_fuse.sh index 07c3ea989497..cbceb144dfba 100755 --- a/qa/workunits/objectstore/test_fuse.sh +++ b/qa/workunits/objectstore/test_fuse.sh @@ -20,7 +20,7 @@ MNT=store_test_fuse_mnt rm -rf $DATA mkdir -p $DATA -fusermount -u $MNT || true +test -d $MNT && fusermount -u $MNT || true rmdir $MNT || true mkdir $MNT @@ -43,46 +43,46 @@ test -d $MNT/meta/all test -d $MNT/meta/by_bitwise_hash # create object -mkdir $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@ -test -e $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@/data -test -d $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@/attr -test -d $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@/omap -test -e $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@/bitwise_hash -test -e $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@/omap_header +mkdir $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0# +test -e $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0#/data +test -d $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0#/attr +test -d $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0#/omap +test -e $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0#/bitwise_hash +test -e $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0#/omap_header # omap header -echo omap header > $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@/omap_header -grep -q omap $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@/omap_header +echo omap header > $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0#/omap_header +grep -q omap $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0#/omap_header # omap -echo value a > $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@/omap/keya -echo value b > $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@/omap/keyb -ls $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@/omap | grep -c key | grep -q 2 -grep 'value a' $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@/omap/keya -grep 'value b' $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@/omap/keyb -rm $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@/omap/keya -test ! -e $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@/omap/keya -rm $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@/omap/keyb -test ! -e $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@/omap/keyb +echo value a > $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0#/omap/keya +echo value b > $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0#/omap/keyb +ls $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0#/omap | grep -c key | grep -q 2 +grep 'value a' $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0#/omap/keya +grep 'value b' $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0#/omap/keyb +rm $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0#/omap/keya +test ! -e $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0#/omap/keya +rm $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0#/omap/keyb +test ! -e $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0#/omap/keyb # attr -echo value a > $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@/attr/keya -echo value b > $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@/attr/keyb -ls $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@/attr | grep -c key | grep -q 2 -grep 'value a' $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@/attr/keya -grep 'value b' $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@/attr/keyb -rm $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@/attr/keya -test ! -e $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@/attr/keya -rm $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@/attr/keyb -test ! -e $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@/attr/keyb +echo value a > $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0#/attr/keya +echo value b > $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0#/attr/keyb +ls $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0#/attr | grep -c key | grep -q 2 +grep 'value a' $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0#/attr/keya +grep 'value b' $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0#/attr/keyb +rm $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0#/attr/keya +test ! -e $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0#/attr/keya +rm $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0#/attr/keyb +test ! -e $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0#/attr/keyb # data -test ! -s $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@/data -echo asdfasdfasdf > $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@/data -test -s $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@/data -grep -q asdfasdfasdf $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@/data -rm $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@/data -test ! -s $MNT/meta/all/@-1:7b3f43c4:::osd_superblock:0@/data +test ! -s $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0#/data +echo asdfasdfasdf > $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0#/data +test -s $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0#/data +grep -q asdfasdfasdf $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0#/data +rm $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0#/data +test ! -s $MNT/meta/all/#-1:7b3f43c4:::osd_superblock:0#/data # create pg collection mkdir --mode 0003 $MNT/0.0_head @@ -98,16 +98,16 @@ grep -q 80000000 $MNT/0.1_head/bitwise_hash_start grep -q 9fffffff $MNT/0.1_head/bitwise_hash_end # create pg object -mkdir $MNT/0.0_head/all/@0:00000000::::head@/ -mkdir $MNT/0.0_head/all/@0:10000000:::foo:head@/ +mkdir $MNT/0.0_head/all/#0:00000000::::head#/ +mkdir $MNT/0.0_head/all/#0:10000000:::foo:head#/ # verify pg bounds check -expect_false mkdir $MNT/0.0_head/all/@0:20000000:::bar:head@/ +expect_false mkdir $MNT/0.0_head/all/#0:20000000:::bar:head#/ # remove a collection expect_false rmdir $MNT/0.0_head -rmdir $MNT/0.0_head/all/@0:10000000:::foo:head@/ -rmdir $MNT/0.0_head/all/@0:00000000::::head@/ +rmdir $MNT/0.0_head/all/#0:10000000:::foo:head#/ +rmdir $MNT/0.0_head/all/#0:00000000::::head#/ rmdir $MNT/0.0_head rmdir $MNT/0.1_head