From 27832e2781f0dda035b7186abf963b5032bccb25 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Mon, 17 Sep 2018 15:07:15 -0400 Subject: [PATCH] qa/workunits/rbd: image compare should print byte offset of any deltas This will assist in debugging any mirroring issues. Signed-off-by: Jason Dillaman --- qa/workunits/rbd/rbd_mirror_helpers.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/qa/workunits/rbd/rbd_mirror_helpers.sh b/qa/workunits/rbd/rbd_mirror_helpers.sh index c1f0643e50e30..e94411c533d60 100755 --- a/qa/workunits/rbd/rbd_mirror_helpers.sh +++ b/qa/workunits/rbd/rbd_mirror_helpers.sh @@ -905,9 +905,9 @@ compare_images() local loc_export=${TEMPDIR}/${CLUSTER1}-${pool}-${image}.export rm -f ${rmt_export} ${loc_export} - rbd --cluster ${CLUSTER2} -p ${pool} export ${image} ${rmt_export} - rbd --cluster ${CLUSTER1} -p ${pool} export ${image} ${loc_export} - cmp ${rmt_export} ${loc_export} + rbd --cluster ${CLUSTER2} -p ${pool} export ${image} - | xxd > ${rmt_export} + rbd --cluster ${CLUSTER1} -p ${pool} export ${image} - | xxd > ${loc_export} + sdiff -s ${rmt_export} ${loc_export} | head -n 64 rm -f ${rmt_export} ${loc_export} } @@ -922,9 +922,9 @@ compare_image_snapshots() for snap_name in $(rbd --cluster ${CLUSTER1} -p ${pool} --format xml \ snap list ${image} | $XMLSTARLET sel -t -v "//snapshot/name"); do rm -f ${rmt_export} ${loc_export} - rbd --cluster ${CLUSTER2} -p ${pool} export ${image}@${snap_name} ${rmt_export} - rbd --cluster ${CLUSTER1} -p ${pool} export ${image}@${snap_name} ${loc_export} - cmp ${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} + sdiff -s ${rmt_export} ${loc_export} | head -n 64 done rm -f ${rmt_export} ${loc_export} } -- 2.39.5