From: Ilya Dryomov <idryomov@gmail.com>
Date: Thu, 12 Apr 2018 09:19:09 +0000 (+0200)
Subject: qa: krbd_fallocate.sh: parameterize assert_deallocated()
X-Git-Tag: v13.1.0~177^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f6d976b75629f5818467a199869270ba5c58ea8a;p=ceph.git

qa: krbd_fallocate.sh: parameterize assert_deallocated()

Take num_objects_expected, similar to assert_deallocated_unaligned().

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---

diff --git a/qa/workunits/rbd/krbd_fallocate.sh b/qa/workunits/rbd/krbd_fallocate.sh
index 97d240a27e0a2..44cac553ffc84 100755
--- a/qa/workunits/rbd/krbd_fallocate.sh
+++ b/qa/workunits/rbd/krbd_fallocate.sh
@@ -51,12 +51,14 @@ EOF
 }
 
 function assert_deallocated() {
+    local num_objects_expected=$1
+
     cmp <(od -xAx $DEV) - <<EOF
 000000 0000 0000 0000 0000 0000 0000 0000 0000
 *
 $(printf %x $IMAGE_SIZE)
 EOF
-    [[ $(rados -p rbd ls | grep -c rbd_data.$IMAGE_ID) -eq 0 ]]
+    [[ $(rados -p rbd ls | grep -c rbd_data.$IMAGE_ID) -eq $num_objects_expected ]]
 }
 
 function assert_deallocated_unaligned() {
@@ -90,24 +92,24 @@ IMAGE_ID="$(rbd info --format=json $IMAGE_NAME |
 DEV=$(sudo rbd map $IMAGE_NAME)
 
 # make sure -ENOENT is hidden
-assert_deallocated
+assert_deallocated 0
 py_blkdiscard 0
-assert_deallocated
+assert_deallocated 0
 
 # blkdev_issue_discard
 allocate
 py_blkdiscard 0
-assert_deallocated
+assert_deallocated 0
 
 # blkdev_issue_zeroout w/ BLKDEV_ZERO_NOUNMAP
 allocate
 py_fallocate FALLOC_FL_ZERO_RANGE\|FALLOC_FL_KEEP_SIZE 0
-assert_deallocated
+assert_deallocated 0
 
 # blkdev_issue_zeroout w/ BLKDEV_ZERO_NOFALLBACK
 allocate
 py_fallocate FALLOC_FL_PUNCH_HOLE\|FALLOC_FL_KEEP_SIZE 0
-assert_deallocated
+assert_deallocated 0
 
 # unaligned blkdev_issue_discard
 allocate