]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
qa: allow small allocation diffs for exported rbds
authorJosh Durgin <jdurgin@redhat.com>
Wed, 12 Nov 2014 02:16:02 +0000 (18:16 -0800)
committerJosh Durgin <jdurgin@redhat.com>
Wed, 12 Nov 2014 19:20:38 +0000 (11:20 -0800)
The local filesytem may behave slightly differently. This isn't
foolproof, but seems to be reliable enough on rhel7 rootfs, where
exact comparison was failing.

Fixes: #10002
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit e94d3c11edb9c9cbcf108463fdff8404df79be33)

qa/workunits/rbd/import_export.sh

index 8566d18e48e4d7738cbe5a85756544aaec18085b..284e1f343637bccc20fbcaf0ba9b212c32d17be9 100755 (executable)
@@ -19,7 +19,9 @@ compare_files_and_ondisk_sizes () {
     cmp -l $1 $2 || return 1
     origsize=$(stat $1 --format %b)
     exportsize=$(stat $2 --format %b)
-    [ $origsize = $exportsize ]
+    difference=$(($exportsize - $origsize))
+    difference=${difference#-} # absolute value
+    test $difference -ge 0 -a $difference -lt 4096
 }
 
 # cannot import a dir