From: Sage Weil <sage@inktank.com>
Date: Thu, 28 Mar 2013 04:26:54 +0000 (-0700)
Subject: qa: rbd/diff_continuous.sh: base test off a clone
X-Git-Tag: v0.62~118^2~35
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f2b0880a895725a1d5f2a56412f0fefe6ca18bb5;p=ceph.git

qa: rbd/diff_continuous.sh: base test off a clone

Get a bit of coverage on clones by starting with a clone.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/qa/workunits/rbd/diff_continuous.sh b/qa/workunits/rbd/diff_continuous.sh
index b7f4dc01adee..6b2142d35a4a 100755
--- a/qa/workunits/rbd/diff_continuous.sh
+++ b/qa/workunits/rbd/diff_continuous.sh
@@ -1,12 +1,13 @@
 #!/bin/bash -ex
 
-max=30
+max=20
 size=1500
 
 iosize=16384
 iototal=16384000
 iothreads=16
 
+parent=`uuidgen`"-parent"
 src=`uuidgen`"-src";
 dst=`uuidgen`"-dst";
 
@@ -15,25 +16,33 @@ function cleanup() {
     rbd rm $src || :
     rbd snap purge $dst || :
     rbd rm $dst || :
+    rbd snap unprotect $parent --snap parent || :
+    rbd snap purge $parent || :
+    rbd rm $parent || :
 }
 trap cleanup EXIT
 
-rbd create $src --size $size
-rbd create $dst --size $size
+# start from a clone
+rbd create $parent --size $size --image-format 2
+rbd bench-write $parent --io-size $iosize --io-threads $iothreads --io-total $iototal --io-pattern rand 
+rbd snap create $parent --snap parent
+rbd snap protect $parent --snap parent
+rbd clone $parent@parent $src
+#rbd create $src --size $size --format 2
+rbd create $dst --size $size --image-format 2
 
 # mirror for a while
-
-rbd snap create $src --snap=snap0
-rbd bench-write $src --io-size $iosize --io-threads $iothreads --io-total $iototal --io-pattern rand 
-lastsnap=snap0
 for s in `seq 1 $max`; do
     rbd snap create $src --snap=snap$s
-    rbd export-diff $src@snap$s - --from-snap $lastsnap | rbd import-diff - $dst  &
+    rbd export-diff $src@snap$s - $lastsnap | rbd import-diff - $dst  &
     rbd bench-write $src --io-size $iosize --io-threads $iothreads --io-total $iototal --io-pattern rand  &
     wait
-    lastsnap=snap$s
+    lastsnap="--from-snap snap$s"
 done
 
+#trap "" EXIT
+#exit 0
+
 # validate
 for s in `seq 1 $max`; do
     ssum=`rbd export $src@snap$s - | md5sum`