Merge pull request ceph#59112 from idryomov/wip-67353

qa: adjust expected io_opt in krbd_discard_granularity.t

Reviewed-by: Ramana Raja <[email protected]>

Author: idryomov

qa/rbd/krbd_discard_granularity.t

@@ -1,11 +1,13 @@
 
+Default object size:
+
   $ rbd create --size 20M img
 
   $ DEV=$(sudo rbd map img)
   $ blockdev --getiomin $DEV
   65536
   $ blockdev --getioopt $DEV
-  65536
+  4194304
   $ cat /sys/block/${DEV#/dev/}/queue/discard_granularity
   65536
   $ sudo rbd unmap $DEV
@@ -14,7 +16,7 @@
   $ blockdev --getiomin $DEV
   512
   $ blockdev --getioopt $DEV
-  512
+  4194304
   $ cat /sys/block/${DEV#/dev/}/queue/discard_granularity
   512
   $ sudo rbd unmap $DEV
@@ -38,3 +40,45 @@
   $ sudo rbd unmap $DEV
 
   $ rbd rm --no-progress img
+
+Custom object size:
+
+  $ rbd create --size 20M --object-size 1M img
+
+  $ DEV=$(sudo rbd map img)
+  $ blockdev --getiomin $DEV
+  65536
+  $ blockdev --getioopt $DEV
+  1048576
+  $ cat /sys/block/${DEV#/dev/}/queue/discard_granularity
+  65536
+  $ sudo rbd unmap $DEV
+
+  $ DEV=$(sudo rbd map -o alloc_size=512 img)
+  $ blockdev --getiomin $DEV
+  512
+  $ blockdev --getioopt $DEV
+  1048576
+  $ cat /sys/block/${DEV#/dev/}/queue/discard_granularity
+  512
+  $ sudo rbd unmap $DEV
+
+  $ DEV=$(sudo rbd map -o alloc_size=1048576 img)
+  $ blockdev --getiomin $DEV
+  1048576
+  $ blockdev --getioopt $DEV
+  1048576
+  $ cat /sys/block/${DEV#/dev/}/queue/discard_granularity
+  1048576
+  $ sudo rbd unmap $DEV
+
+  $ DEV=$(sudo rbd map -o alloc_size=2097152 img)
+  $ blockdev --getiomin $DEV
+  1048576
+  $ blockdev --getioopt $DEV
+  1048576
+  $ cat /sys/block/${DEV#/dev/}/queue/discard_granularity
+  1048576
+  $ sudo rbd unmap $DEV
+
+  $ rbd rm --no-progress img