]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/workunits/rbd: exclude rbd-mirror sync-point snaps from comparison
authorJason Dillaman <dillaman@redhat.com>
Tue, 25 Sep 2018 20:08:25 +0000 (16:08 -0400)
committerJason Dillaman <dillaman@redhat.com>
Tue, 25 Sep 2018 20:08:25 +0000 (16:08 -0400)
This is a temporary workaround to tracker ticket issue #36185

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
qa/workunits/rbd/rbd_mirror_helpers.sh

index e94411c533d6082ad51c7530fb79a2c8aefa69b9..41841fabd85bb3c489039ea78a0cefaa1689d998 100755 (executable)
@@ -920,7 +920,9 @@ compare_image_snapshots()
     local loc_export=${TEMPDIR}/${CLUSTER1}-${pool}-${image}.export
 
     for snap_name in $(rbd --cluster ${CLUSTER1} -p ${pool} --format xml \
-                           snap list ${image} | $XMLSTARLET sel -t -v "//snapshot/name"); do
+                           snap list ${image} | \
+                           $XMLSTARLET sel -t -v "//snapshot/name" | \
+                           grep -E -v "^\.rbd-mirror\."); do
         rm -f ${rmt_export} ${loc_export}
         rbd --cluster ${CLUSTER2} -p ${pool} export ${image}@${snap_name} - | xxd > ${rmt_export}
         rbd --cluster ${CLUSTER1} -p ${pool} export ${image}@${snap_name} - | xxd > ${loc_export}