Skip to content

Commit

Permalink
qa: update and rename krbd_discard_1b.t
Browse files Browse the repository at this point in the history
Passing 1 for alloc_size is no longer allowed.

Signed-off-by: Ilya Dryomov <[email protected]>
  • Loading branch information
idryomov committed Mar 18, 2019
1 parent b298aa9 commit 481b6c2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions qa/rbd/krbd_discard_1b.t → qa/rbd/krbd_discard_512b.t
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

$ rbd create --size 4M img
$ DEV=$(sudo rbd map -o alloc_size=1 img)
$ DEV=$(sudo rbd map -o alloc_size=512 img)

Zero, < 1 block:

Expand Down Expand Up @@ -312,7 +312,7 @@ Empty clone:
$ rbd snap protect img@snap

$ rbd clone img@snap cloneimg1
$ DEV=$(sudo rbd map -o alloc_size=1 cloneimg1)
$ DEV=$(sudo rbd map -o alloc_size=512 cloneimg1)
$ blkdiscard -o 720896 -l 2719744 $DEV
$ hexdump $DEV
0000000 abab abab abab abab abab abab abab abab
Expand All @@ -321,7 +321,7 @@ Empty clone:
$ sudo rbd unmap $DEV

$ rbd clone img@snap cloneimg2
$ DEV=$(sudo rbd map -o alloc_size=1 cloneimg2)
$ DEV=$(sudo rbd map -o alloc_size=512 cloneimg2)
$ blkdiscard -o 1474560 -l 2719744 $DEV
$ hexdump $DEV
0000000 abab abab abab abab abab abab abab abab
Expand All @@ -330,7 +330,7 @@ Empty clone:
$ sudo rbd unmap $DEV

$ rbd clone img@snap cloneimg3
$ DEV=$(sudo rbd map -o alloc_size=1 cloneimg3)
$ DEV=$(sudo rbd map -o alloc_size=512 cloneimg3)
$ blkdiscard -o 0 -l 4194304 $DEV
$ hexdump $DEV
0000000 abab abab abab abab abab abab abab abab
Expand All @@ -341,7 +341,7 @@ Empty clone:
Full clone:

$ rbd clone img@snap cloneimg4
$ DEV=$(sudo rbd map -o alloc_size=1 cloneimg4)
$ DEV=$(sudo rbd map -o alloc_size=512 cloneimg4)

$ xfs_io -c 'pwrite -w 0 4M' $DEV >/dev/null
$ blkdiscard -o 720896 -l 2719744 $DEV
Expand Down Expand Up @@ -375,7 +375,7 @@ Full clone:
Multiple object requests:

$ rbd create --size 50M --stripe-unit 16K --stripe-count 5 fancyimg
$ DEV=$(sudo rbd map -o alloc_size=1 fancyimg)
$ DEV=$(sudo rbd map -o alloc_size=512 fancyimg)

$ xfs_io -c 'pwrite -b 4M -w 0 50M' $DEV >/dev/null
$ blkdiscard -o 0 -l 143360 $DEV
Expand Down
2 changes: 1 addition & 1 deletion qa/suites/krbd/basic/tasks/krbd_discard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ tasks:
clients:
client.0:
- qa/rbd/krbd_discard.t
- qa/rbd/krbd_discard_1b.t
- qa/rbd/krbd_discard_512b.t
- qa/rbd/krbd_discard_4M.t
- qa/rbd/krbd_zeroout.t

0 comments on commit 481b6c2

Please sign in to comment.