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 <idryomov@gmail.com>

diff --git a/qa/rbd/krbd_blkroset.t b/qa/rbd/krbd_blkroset.t
index cbbd06ce2aef5040fbd5427b8c18049be17b89bb..893fcc4d44eb7dd2f278cae69c8ab8a9b3028ffa 100644 (file)
--- 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 7235f0036681a241d73ef2d640723a7ff654b043..486b966d93dd2be54ce5f80ecc190d50c59e1bdc 100644 (file)
--- 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 99f7261f2ab410ae8d7261b8c6f641f5c7efb8db..528e1dc3db0b5154d9566f164940d7a4293d60b1 100644 (file)
--- 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 6c3d7cc74c1e98e3635965f2f1b7b47f2967656f..7ed744c1105fcafe6739bf27516ebe4bf4ce1b57 100644 (file)
--- 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 b3a7c4470bec081d98bb4eb92c199f7900ccf7e7..6669ca8fcde3983d3494ca62afd647011df7b4e7 100644 (file)
--- 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 b3abf3ce7c00e3ead8b972ef40d679ef63703c3a..0c26e9c33231324f4d83d034b827468bd1ef75a5 100644 (file)
--- 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 a113311b4a9e6ec869e28728d93111fa5735f97e..3489d83db497a70a587cf1348f3953659b116ae7 100644 (file)
--- 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 eaee487a12756df054b7804c5e9abca14bef08c7..850c8c968e2cddf2b70869c7e7b42443e16188d6 100644 (file)
--- 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 33c8e9d9e113ad5e3a71117e05371232974157dc..10bb230e8025b2f94906414743ca58939586fe9e 100644 (file)
--- 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