From d04a7679c09ae599562d2bc15d73f8c46cf89d48 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Tue, 25 Sep 2018 16:08:25 -0400 Subject: [PATCH] qa/workunits/rbd: exclude rbd-mirror sync-point snaps from comparison This is a temporary workaround to tracker ticket issue #36185 Signed-off-by: Jason Dillaman --- qa/workunits/rbd/rbd_mirror_helpers.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/qa/workunits/rbd/rbd_mirror_helpers.sh b/qa/workunits/rbd/rbd_mirror_helpers.sh index e94411c533d60..41841fabd85bb 100755 --- a/qa/workunits/rbd/rbd_mirror_helpers.sh +++ b/qa/workunits/rbd/rbd_mirror_helpers.sh @@ -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} -- 2.39.5