From f8a9880cbb6655580b8b94cc6bcb4595c25f3bae Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Tue, 11 Aug 2020 17:45:18 +0200 Subject: [PATCH] qa: update krbd tests for snap create "rbd snap create" now reports progress. Pass --no-progress, as in commit b5a5fea9e2b4 ("test/cli-integration/rbd: tweak after snap create started to show progress"). Signed-off-by: Ilya Dryomov --- qa/rbd/krbd_blkroset.t | 4 ++-- qa/rbd/krbd_deep_flatten.t | 24 ++++++++++++------------ qa/rbd/krbd_discard.t | 2 +- qa/rbd/krbd_discard_4M.t | 2 +- qa/rbd/krbd_discard_512b.t | 2 +- qa/rbd/krbd_get_features.t | 2 +- qa/rbd/krbd_parent_overlap.t | 4 ++-- qa/rbd/krbd_whole_object_zeroout.t | 2 +- qa/rbd/krbd_zeroout.t | 2 +- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/qa/rbd/krbd_blkroset.t b/qa/rbd/krbd_blkroset.t index cbbd06ce2aef5..893fcc4d44eb7 100644 --- a/qa/rbd/krbd_blkroset.t +++ b/qa/rbd/krbd_blkroset.t @@ -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 diff --git a/qa/rbd/krbd_deep_flatten.t b/qa/rbd/krbd_deep_flatten.t index 7235f0036681a..486b966d93dd2 100644 --- a/qa/rbd/krbd_deep_flatten.t +++ b/qa/rbd/krbd_deep_flatten.t @@ -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 diff --git a/qa/rbd/krbd_discard.t b/qa/rbd/krbd_discard.t index 99f7261f2ab41..528e1dc3db0b5 100644 --- a/qa/rbd/krbd_discard.t +++ b/qa/rbd/krbd_discard.t @@ -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 diff --git a/qa/rbd/krbd_discard_4M.t b/qa/rbd/krbd_discard_4M.t index 6c3d7cc74c1e9..7ed744c1105fc 100644 --- a/qa/rbd/krbd_discard_4M.t +++ b/qa/rbd/krbd_discard_4M.t @@ -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 diff --git a/qa/rbd/krbd_discard_512b.t b/qa/rbd/krbd_discard_512b.t index b3a7c4470bec0..6669ca8fcde39 100644 --- a/qa/rbd/krbd_discard_512b.t +++ b/qa/rbd/krbd_discard_512b.t @@ -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 diff --git a/qa/rbd/krbd_get_features.t b/qa/rbd/krbd_get_features.t index b3abf3ce7c00e..0c26e9c332313 100644 --- a/qa/rbd/krbd_get_features.t +++ b/qa/rbd/krbd_get_features.t @@ -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 diff --git a/qa/rbd/krbd_parent_overlap.t b/qa/rbd/krbd_parent_overlap.t index a113311b4a9e6..3489d83db497a 100644 --- a/qa/rbd/krbd_parent_overlap.t +++ b/qa/rbd/krbd_parent_overlap.t @@ -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 diff --git a/qa/rbd/krbd_whole_object_zeroout.t b/qa/rbd/krbd_whole_object_zeroout.t index eaee487a12756..850c8c968e2cd 100644 --- a/qa/rbd/krbd_whole_object_zeroout.t +++ b/qa/rbd/krbd_whole_object_zeroout.t @@ -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: diff --git a/qa/rbd/krbd_zeroout.t b/qa/rbd/krbd_zeroout.t index 33c8e9d9e113a..10bb230e8025b 100644 --- a/qa/rbd/krbd_zeroout.t +++ b/qa/rbd/krbd_zeroout.t @@ -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 -- 2.39.5