From 1cfd21ccc7576c03914fa48d414451fdd53fb9a5 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Thu, 1 Jul 2021 14:06:54 -0500 Subject: iotests: Improve and rename test 309 to nbd-qemu-allocation Enhance the test to inspect what qemu-nbd is advertising during handshake, and rename it now that we support useful iotest names. Signed-off-by: Eric Blake Reviewed-by: Vladimir Sementsov-Ogievskiy Message-Id: <20210701190655.2131223-2-eblake@redhat.com> --- tests/qemu-iotests/309 | 78 ----------------------- tests/qemu-iotests/309.out | 22 ------- tests/qemu-iotests/tests/nbd-qemu-allocation | 81 ++++++++++++++++++++++++ tests/qemu-iotests/tests/nbd-qemu-allocation.out | 32 ++++++++++ 4 files changed, 113 insertions(+), 100 deletions(-) delete mode 100755 tests/qemu-iotests/309 delete mode 100644 tests/qemu-iotests/309.out create mode 100755 tests/qemu-iotests/tests/nbd-qemu-allocation create mode 100644 tests/qemu-iotests/tests/nbd-qemu-allocation.out (limited to 'tests') diff --git a/tests/qemu-iotests/309 b/tests/qemu-iotests/309 deleted file mode 100755 index b90b279994..0000000000 --- a/tests/qemu-iotests/309 +++ /dev/null @@ -1,78 +0,0 @@ -#!/usr/bin/env bash -# group: rw auto quick -# -# Test qemu-nbd -A -# -# Copyright (C) 2018-2020 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 . -# - -seq="$(basename $0)" -echo "QA output created by $seq" - -status=1 # failure is the default! - -_cleanup() -{ - _cleanup_test_img - nbd_server_stop -} -trap "_cleanup; exit \$status" 0 1 2 3 15 - -# get standard environment, filters and checks -. ./common.rc -. ./common.filter -. ./common.nbd - -_supported_fmt qcow2 -_supported_proto file -_supported_os Linux -_require_command QEMU_NBD - -echo -echo "=== Initial image setup ===" -echo - -TEST_IMG="$TEST_IMG.base" _make_test_img 4M -$QEMU_IO -c 'w 0 2M' -f $IMGFMT "$TEST_IMG.base" | _filter_qemu_io -_make_test_img -b "$TEST_IMG.base" -F $IMGFMT 4M -$QEMU_IO -c 'w 1M 2M' -f $IMGFMT "$TEST_IMG" | _filter_qemu_io - -echo -echo "=== Check allocation over NBD ===" -echo - -$QEMU_IMG map --output=json -f qcow2 "$TEST_IMG" -IMG="driver=nbd,server.type=unix,server.path=$nbd_unix_socket" -nbd_server_start_unix_socket -r -f qcow2 -A "$TEST_IMG" -# Normal -f raw NBD block status loses access to allocation information -$QEMU_IMG map --output=json --image-opts \ - "$IMG" | _filter_qemu_img_map -# But when we use -A, coupled with x-dirty-bitmap in the client for feeding -# 2-bit block status from an alternative NBD metadata context (note that -# the client code for x-dirty-bitmap intentionally collapses all depths -# beyond 2 into a single value), we can determine: -# unallocated (depth 0) => "zero":false, "data":true -# local (depth 1) => "zero":false, "data":false -# backing (depth 2+) => "zero":true, "data":true -$QEMU_IMG map --output=json --image-opts \ - "$IMG,x-dirty-bitmap=qemu:allocation-depth" | _filter_qemu_img_map -# More accurate results can be obtained by other NBD clients such as -# libnbd, but this test works without such external dependencies. - -# success, all done -echo '*** done' -rm -f $seq.full -status=0 diff --git a/tests/qemu-iotests/309.out b/tests/qemu-iotests/309.out deleted file mode 100644 index db75bb6b0d..0000000000 --- a/tests/qemu-iotests/309.out +++ /dev/null @@ -1,22 +0,0 @@ -QA output created by 309 - -=== Initial image setup === - -Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=4194304 -wrote 2097152/2097152 bytes at offset 0 -2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4194304 backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=IMGFMT -wrote 2097152/2097152 bytes at offset 1048576 -2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) - -=== Check allocation over NBD === - -[{ "start": 0, "length": 1048576, "depth": 1, "zero": false, "data": true, "offset": 327680}, -{ "start": 1048576, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": 327680}, -{ "start": 3145728, "length": 1048576, "depth": 1, "zero": true, "data": false}] -[{ "start": 0, "length": 3145728, "depth": 0, "zero": false, "data": true, "offset": OFFSET}, -{ "start": 3145728, "length": 1048576, "depth": 0, "zero": true, "data": false, "offset": OFFSET}] -[{ "start": 0, "length": 1048576, "depth": 0, "zero": true, "data": true, "offset": OFFSET}, -{ "start": 1048576, "length": 2097152, "depth": 0, "zero": false, "data": false}, -{ "start": 3145728, "length": 1048576, "depth": 0, "zero": false, "data": true, "offset": OFFSET}] -*** done diff --git a/tests/qemu-iotests/tests/nbd-qemu-allocation b/tests/qemu-iotests/tests/nbd-qemu-allocation new file mode 100755 index 0000000000..4ee73db803 --- /dev/null +++ b/tests/qemu-iotests/tests/nbd-qemu-allocation @@ -0,0 +1,81 @@ +#!/usr/bin/env bash +# group: rw auto quick +# +# Test qemu-nbd -A +# +# Copyright (C) 2018-2021 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 . +# + +seq="$(basename $0)" +echo "QA output created by $seq" + +status=1 # failure is the default! + +_cleanup() +{ + _cleanup_test_img + nbd_server_stop +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + +# get standard environment, filters and checks +cd .. +. ./common.rc +. ./common.filter +. ./common.nbd + +_supported_fmt qcow2 +_supported_proto file +_supported_os Linux +_require_command QEMU_NBD + +echo +echo "=== Initial image setup ===" +echo + +TEST_IMG="$TEST_IMG.base" _make_test_img 4M +$QEMU_IO -c 'w 0 2M' -f $IMGFMT "$TEST_IMG.base" | _filter_qemu_io +_make_test_img -b "$TEST_IMG.base" -F $IMGFMT 4M +$QEMU_IO -c 'w 1M 2M' -f $IMGFMT "$TEST_IMG" | _filter_qemu_io + +echo +echo "=== Check allocation over NBD ===" +echo + +$QEMU_IMG map --output=json -f qcow2 "$TEST_IMG" +IMG="driver=nbd,server.type=unix,server.path=$nbd_unix_socket" +nbd_server_start_unix_socket -r -f qcow2 -A "$TEST_IMG" +# Inspect what the server is exposing +$QEMU_NBD --list -k $nbd_unix_socket +# Normal -f raw NBD block status loses access to allocation information +$QEMU_IMG map --output=json --image-opts \ + "$IMG" | _filter_qemu_img_map +# But when we use -A, coupled with x-dirty-bitmap in the client for feeding +# 2-bit block status from an alternative NBD metadata context (note that +# the client code for x-dirty-bitmap intentionally collapses all depths +# beyond 2 into a single value), we can determine: +# unallocated (depth 0) => "zero":false, "data":true +# local (depth 1) => "zero":false, "data":false +# backing (depth 2+) => "zero":true, "data":true +$QEMU_IMG map --output=json --image-opts \ + "$IMG,x-dirty-bitmap=qemu:allocation-depth" | _filter_qemu_img_map +# More accurate results can be obtained by other NBD clients such as +# libnbd, but this test works without such external dependencies. + +# success, all done +echo '*** done' +rm -f $seq.full +status=0 diff --git a/tests/qemu-iotests/tests/nbd-qemu-allocation.out b/tests/qemu-iotests/tests/nbd-qemu-allocation.out new file mode 100644 index 0000000000..c51022b2a3 --- /dev/null +++ b/tests/qemu-iotests/tests/nbd-qemu-allocation.out @@ -0,0 +1,32 @@ +QA output created by nbd-qemu-allocation + +=== Initial image setup === + +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=4194304 +wrote 2097152/2097152 bytes at offset 0 +2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4194304 backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=IMGFMT +wrote 2097152/2097152 bytes at offset 1048576 +2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +=== Check allocation over NBD === + +[{ "start": 0, "length": 1048576, "depth": 1, "zero": false, "data": true, "offset": 327680}, +{ "start": 1048576, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": 327680}, +{ "start": 3145728, "length": 1048576, "depth": 1, "zero": true, "data": false}] +exports available: 1 + export: '' + size: 4194304 + flags: 0x58f ( readonly flush fua df multi cache ) + min block: 1 + opt block: 4096 + max block: 33554432 + available meta contexts: 2 + base:allocation + qemu:allocation-depth +[{ "start": 0, "length": 3145728, "depth": 0, "zero": false, "data": true, "offset": OFFSET}, +{ "start": 3145728, "length": 1048576, "depth": 0, "zero": true, "data": false, "offset": OFFSET}] +[{ "start": 0, "length": 1048576, "depth": 0, "zero": true, "data": true, "offset": OFFSET}, +{ "start": 1048576, "length": 2097152, "depth": 0, "zero": false, "data": false}, +{ "start": 3145728, "length": 1048576, "depth": 0, "zero": false, "data": true, "offset": OFFSET}] +*** done -- cgit v1.2.3-55-g7522