From 481b6c2146ac891787ffae6deb2fc77e9cb56542 Mon Sep 17 00:00:00 2001
From: Ilya Dryomov <idryomov@gmail.com>
Date: Mon, 18 Mar 2019 19:15:30 +0100
Subject: [PATCH] qa: update and rename krbd_discard_1b.t

Passing 1 for alloc_size is no longer allowed.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---
 qa/rbd/{krbd_discard_1b.t => krbd_discard_512b.t} | 12 ++++++------
 qa/suites/krbd/basic/tasks/krbd_discard.yaml      |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename qa/rbd/{krbd_discard_1b.t => krbd_discard_512b.t} (96%)

diff --git a/qa/rbd/krbd_discard_1b.t b/qa/rbd/krbd_discard_512b.t
similarity index 96%
rename from qa/rbd/krbd_discard_1b.t
rename to qa/rbd/krbd_discard_512b.t
index 5013e30fc2a..b3a7c4470be 100644
--- a/qa/rbd/krbd_discard_1b.t
+++ b/qa/rbd/krbd_discard_512b.t
@@ -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:
 
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/qa/suites/krbd/basic/tasks/krbd_discard.yaml b/qa/suites/krbd/basic/tasks/krbd_discard.yaml
index 4132caeb230..869bef00ae3 100644
--- a/qa/suites/krbd/basic/tasks/krbd_discard.yaml
+++ b/qa/suites/krbd/basic/tasks/krbd_discard.yaml
@@ -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
-- 
2.39.5