36452f12f8
This patch moves ret assignment after reporting original error. We were lucky to pass qemu-iotests 048 (qemu-img compare case) but when I tried to run with TEST_DIR=/tmp (tmpfs), it fails with a "wrong" mismatch offset. This fixes two bugs. In the first if branch, setting ret to 1 before using it makes dead code in the next line: pnum is never added to mismatch offset even if ret was 0. In the other if branch, currently the output error is always -4: strerror(-4) -> Unknown error -4 Added regression test in case 048. Signed-off-by: Fam Zheng <famz@redhat.com> Signed-off-by: Amos Kong <akong@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Fam Zheng <famz@redhat.com>
113 lines
2.6 KiB
Bash
Executable File
113 lines
2.6 KiB
Bash
Executable File
#!/bin/bash
|
|
##
|
|
## qemu-img compare test
|
|
##
|
|
##
|
|
## Copyright (C) 2013 Red Hat, Inc.
|
|
##
|
|
## This program is free software; you can redistribute it and/or modify
|
|
## it under the terms of the GNU General Public License as published by
|
|
## the Free Software Foundation; either version 2 of the License, or
|
|
## (at your option) any later version.
|
|
##
|
|
## This program is distributed in the hope that it will be useful,
|
|
## but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
## GNU General Public License for more details.
|
|
##
|
|
## You should have received a copy of the GNU General Public License
|
|
## along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
##
|
|
#
|
|
# creator
|
|
owner=mrezanin@redhat.com
|
|
|
|
seq=`basename $0`
|
|
echo "QA output created by $seq"
|
|
|
|
status=1 # failure is the default!
|
|
|
|
_cleanup()
|
|
{
|
|
echo "Cleanup"
|
|
_cleanup_test_img
|
|
rm "${TEST_IMG2}"
|
|
}
|
|
trap "_cleanup; exit \$status" 0 1 2 3 15
|
|
|
|
_compare()
|
|
{
|
|
$QEMU_IMG compare "$@" "$TEST_IMG" "${TEST_IMG2}"
|
|
echo $?
|
|
}
|
|
|
|
# get standard environment, filters and checks
|
|
. ./common.rc
|
|
. ./common.filter
|
|
. ./common.pattern
|
|
|
|
_supported_fmt raw qcow qcow2 qed
|
|
_supported_proto file
|
|
_supported_os Linux
|
|
|
|
# Setup test basic parameters
|
|
TEST_IMG2=$TEST_IMG.2
|
|
CLUSTER_SIZE=4096
|
|
size=1024M
|
|
|
|
_make_test_img $size
|
|
io_pattern write 524288 $CLUSTER_SIZE $CLUSTER_SIZE 4 45
|
|
|
|
# Compare identical images
|
|
cp "$TEST_IMG" "${TEST_IMG2}"
|
|
_compare
|
|
_compare -q
|
|
|
|
# Compare images with different size
|
|
$QEMU_IMG resize "$TEST_IMG" +512M
|
|
_compare
|
|
_compare -s
|
|
|
|
# Compare images with different content
|
|
io_pattern write 1228800 $CLUSTER_SIZE 0 1 67
|
|
_compare
|
|
io_pattern write 0 $CLUSTER_SIZE 0 1 123
|
|
_compare
|
|
|
|
# Test unaligned case of mismatch offsets in allocated clusters
|
|
_make_test_img $size
|
|
io_pattern write 0 512 0 1 100
|
|
cp "$TEST_IMG" "$TEST_IMG2"
|
|
io_pattern write 512 512 0 1 101
|
|
_compare
|
|
|
|
# Test cluster allocated in one, with IO error
|
|
cat > "$TEST_DIR/blkdebug.conf"<<EOF
|
|
[inject-error]
|
|
event = "read_aio"
|
|
errno = "5"
|
|
once ="off"
|
|
EOF
|
|
_make_test_img $size
|
|
cp "$TEST_IMG" "$TEST_IMG2"
|
|
io_pattern write 512 512 0 1 102
|
|
TEST_IMG="blkdebug:$TEST_DIR/blkdebug.conf:$TEST_IMG" _compare 2>&1 |\
|
|
_filter_testdir | _filter_imgfmt
|
|
|
|
# Test cluster allocated in one, with different sizes and IO error in the part
|
|
# that exists only in one image
|
|
cat > "$TEST_DIR/blkdebug.conf"<<EOF
|
|
[inject-error]
|
|
event = "read_aio"
|
|
errno = "5"
|
|
once ="off"
|
|
EOF
|
|
_make_test_img $size
|
|
TEST_IMG="$TEST_IMG2" _make_test_img 0
|
|
io_pattern write 512 512 0 1 102
|
|
TEST_IMG="blkdebug:$TEST_DIR/blkdebug.conf:$TEST_IMG" _compare 2>&1 |\
|
|
_filter_testdir | _filter_imgfmt
|
|
|
|
# Cleanup
|
|
status=0
|