qa: update krbd tests for snap create

"rbd snap create" now reports progress.  Pass --no-progress, as in
commit b5a5fea9e2 ("test/cli-integration/rbd: tweak after snap create
started to show progress").

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
Ilya Dryomov 2020-08-11 17:45:18 +02:00
parent dc06096a2d
commit f8a9880cbb
9 changed files with 22 additions and 22 deletions

View File

@ -4,7 +4,7 @@ Setup
$ RO_KEY=$(ceph auth get-or-create-key client.ro mon 'profile rbd' mgr 'profile rbd' osd 'profile rbd-read-only')
$ rbd create --size 10 img
$ rbd snap create img@snap
$ rbd snap create --no-progress img@snap
$ rbd snap protect img@snap
$ rbd clone img@snap cloneimg
$ rbd create --size 1 imgpart
@ -15,7 +15,7 @@ Setup
> /dev/rbd0p2 : start= 1024, size= 512, Id=83
> EOF
$ sudo rbd unmap $DEV
$ rbd snap create imgpart@snap
$ rbd snap create --no-progress imgpart@snap
Image HEAD

View File

@ -5,10 +5,10 @@ Write:
$ DEV=$(sudo rbd map img)
$ xfs_io -c 'pwrite -w 0 12M' $DEV >/dev/null
$ sudo rbd unmap $DEV
$ rbd snap create img@snap
$ rbd snap create --no-progress img@snap
$ rbd snap protect img@snap
$ rbd clone img@snap cloneimg
$ rbd snap create cloneimg@snap
$ rbd snap create --no-progress cloneimg@snap
$ DEV=$(sudo rbd map cloneimg)
$ xfs_io -c 'pwrite -S 0xab -w 6M 1k' $DEV >/dev/null
$ sudo rbd unmap $DEV
@ -61,10 +61,10 @@ Write, whole object:
$ DEV=$(sudo rbd map img)
$ xfs_io -c 'pwrite -w 0 12M' $DEV >/dev/null
$ sudo rbd unmap $DEV
$ rbd snap create img@snap
$ rbd snap create --no-progress img@snap
$ rbd snap protect img@snap
$ rbd clone img@snap cloneimg
$ rbd snap create cloneimg@snap
$ rbd snap create --no-progress cloneimg@snap
$ DEV=$(sudo rbd map cloneimg)
$ xfs_io -d -c 'pwrite -b 4M -S 0xab 4M 4M' $DEV >/dev/null
$ sudo rbd unmap $DEV
@ -117,10 +117,10 @@ Zeroout:
$ DEV=$(sudo rbd map img)
$ xfs_io -c 'pwrite -w 0 12M' $DEV >/dev/null
$ sudo rbd unmap $DEV
$ rbd snap create img@snap
$ rbd snap create --no-progress img@snap
$ rbd snap protect img@snap
$ rbd clone img@snap cloneimg
$ rbd snap create cloneimg@snap
$ rbd snap create --no-progress cloneimg@snap
$ DEV=$(sudo rbd map cloneimg)
$ fallocate -z -o 6M -l 1k $DEV
$ sudo rbd unmap $DEV
@ -173,10 +173,10 @@ Zeroout, whole object:
$ DEV=$(sudo rbd map img)
$ xfs_io -c 'pwrite -w 0 12M' $DEV >/dev/null
$ sudo rbd unmap $DEV
$ rbd snap create img@snap
$ rbd snap create --no-progress img@snap
$ rbd snap protect img@snap
$ rbd clone img@snap cloneimg
$ rbd snap create cloneimg@snap
$ rbd snap create --no-progress cloneimg@snap
$ DEV=$(sudo rbd map cloneimg)
$ fallocate -z -o 4M -l 4M $DEV
$ sudo rbd unmap $DEV
@ -229,10 +229,10 @@ Discard, whole object, empty clone:
$ DEV=$(sudo rbd map img)
$ xfs_io -c 'pwrite -w 0 12M' $DEV >/dev/null
$ sudo rbd unmap $DEV
$ rbd snap create img@snap
$ rbd snap create --no-progress img@snap
$ rbd snap protect img@snap
$ rbd clone img@snap cloneimg
$ rbd snap create cloneimg@snap
$ rbd snap create --no-progress cloneimg@snap
$ DEV=$(sudo rbd map cloneimg)
$ blkdiscard -o 4M -l 4M $DEV
$ sudo rbd unmap $DEV
@ -277,10 +277,10 @@ Discard, whole object, full clone:
$ DEV=$(sudo rbd map img)
$ xfs_io -c 'pwrite -w 0 12M' $DEV >/dev/null
$ sudo rbd unmap $DEV
$ rbd snap create img@snap
$ rbd snap create --no-progress img@snap
$ rbd snap protect img@snap
$ rbd clone img@snap cloneimg
$ rbd snap create cloneimg@snap
$ rbd snap create --no-progress cloneimg@snap
$ DEV=$(sudo rbd map cloneimg)
$ xfs_io -c 'pwrite -S 0xab -w 0 12M' $DEV >/dev/null
$ blkdiscard -o 4M -l 4M $DEV

View File

@ -280,7 +280,7 @@ Empty clone:
$ xfs_io -c 'pwrite -S 0xab -w 0 4M' $DEV >/dev/null
$ sudo rbd unmap $DEV
$ rbd snap create img@snap
$ rbd snap create --no-progress img@snap
$ rbd snap protect img@snap
$ rbd clone img@snap cloneimg1

View File

@ -232,7 +232,7 @@ Empty clone:
$ xfs_io -c 'pwrite -S 0xab -w 0 4M' $DEV >/dev/null
$ sudo rbd unmap $DEV
$ rbd snap create img@snap
$ rbd snap create --no-progress img@snap
$ rbd snap protect img@snap
$ rbd clone img@snap cloneimg1

View File

@ -308,7 +308,7 @@ Empty clone:
$ xfs_io -c 'pwrite -S 0xab -w 0 4M' $DEV >/dev/null
$ sudo rbd unmap $DEV
$ rbd snap create img@snap
$ rbd snap create --no-progress img@snap
$ rbd snap protect img@snap
$ rbd clone img@snap cloneimg1

View File

@ -3,7 +3,7 @@ journaling makes the image only unwritable, rather than both unreadable
and unwritable:
$ rbd create --size 1 --image-feature layering,exclusive-lock,journaling img
$ rbd snap create img@snap
$ rbd snap create --no-progress img@snap
$ rbd snap protect img@snap
$ rbd clone --image-feature layering,exclusive-lock,journaling img@snap cloneimg

View File

@ -5,7 +5,7 @@ For reads, only the object extent needs to be reverse mapped:
$ DEV=$(sudo rbd map img)
$ xfs_io -c 'pwrite 0 5M' $DEV >/dev/null
$ sudo rbd unmap $DEV
$ rbd snap create img@snap
$ rbd snap create --no-progress img@snap
$ rbd snap protect img@snap
$ rbd clone img@snap cloneimg
$ rbd resize --no-progress --size 12M cloneimg
@ -34,7 +34,7 @@ For writes, the entire object needs to be reverse mapped:
$ DEV=$(sudo rbd map img)
$ xfs_io -c 'pwrite 0 1M' $DEV >/dev/null
$ sudo rbd unmap $DEV
$ rbd snap create img@snap
$ rbd snap create --no-progress img@snap
$ rbd snap protect img@snap
$ rbd clone img@snap cloneimg
$ rbd resize --no-progress --size 8M cloneimg

View File

@ -7,7 +7,7 @@
$ DEV=$(sudo rbd map img)
$ xfs_io -c 'pwrite -b 4M 0 200M' $DEV >/dev/null
$ sudo rbd unmap $DEV
$ rbd snap create img@snap
$ rbd snap create --no-progress img@snap
$ rbd snap protect img@snap
cloneimg1:

View File

@ -308,7 +308,7 @@ Empty clone:
$ xfs_io -c 'pwrite -S 0xab -w 0 4M' $DEV >/dev/null
$ sudo rbd unmap $DEV
$ rbd snap create img@snap
$ rbd snap create --no-progress img@snap
$ rbd snap protect img@snap
$ rbd clone img@snap cloneimg1