Re: [PATCH v8 3/3] tests/qemu-iotests: add case to write compressed data of multiple clusters

[Vladimir Sementsov-Ogievskiy]

18.11.2019 8:49, Andrey Shinkevich wrote:
> Add the case to the iotest #214 that checks possibility of writing
> compressed data of more than one cluster size. The test case involves
> the compress filter driver showing a sample usage of that.
> 
> Signed-off-by: Andrey Shinkevich <address@hidden>
> ---
>   tests/qemu-iotests/214     | 43 +++++++++++++++++++++++++++++++++++++++++++
>   tests/qemu-iotests/214.out | 14 ++++++++++++++
>   2 files changed, 57 insertions(+)
> 
> diff --git a/tests/qemu-iotests/214 b/tests/qemu-iotests/214
> index 21ec8a2..5012112 100755
> --- a/tests/qemu-iotests/214
> +++ b/tests/qemu-iotests/214
> @@ -89,6 +89,49 @@ _check_test_img -r all
>   $QEMU_IO -c "read  -P 0x11  0 4M" "$TEST_IMG" 2>&1 | _filter_qemu_io | 
> _filter_testdir
>   $QEMU_IO -c "read  -P 0x22 4M 4M" "$TEST_IMG" 2>&1 | _filter_qemu_io | 
> _filter_testdir
>   
> +echo
> +echo "=== Write compressed data of multiple clusters ==="
> +echo
> +cluster_size=0x10000
> +_make_test_img 2M -o cluster_size=$cluster_size
> +
> +echo "Write uncompressed data:"
> +let data_size="8 * $cluster_size"
> +$QEMU_IO -c "write -P 0xaa 0 $data_size" "$TEST_IMG" \
> +         2>&1 | _filter_qemu_io | _filter_testdir
> +sizeA=$($QEMU_IMG info --output=json "$TEST_IMG" |
> +        sed -n '/"actual-size":/ s/[^0-9]//gp')
> +
> +_make_test_img 2M -o cluster_size=$cluster_size
> +echo "Write compressed data:"
> +let data_size="3 * $cluster_size + ($cluster_size / 2)"
> +# Set compress on. That will align the written data
> +# by the cluster size and will write them compressed.
> +QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT \
> +$QEMU_IO -c "write -P 0xbb 0 $data_size" --image-opts \
> +         
> "driver=compress,file.driver=$IMGFMT,file.file.driver=file,file.file.filename=$TEST_IMG"
>  \
> +         2>&1 | _filter_qemu_io | _filter_testdir
> +
> +let offset="4 * $cluster_size"

Could you make it
let offset="4 * $cluster_size + ($cluster_size / 4)"

To check both unaligned head and tail?
It should not change the output.

With or without this:
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>

PS: ogh, bash is crazy, arithmetic in string o_O

> +QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT \
> +$QEMU_IO -c "write -P 0xcc $offset $data_size" "json:{\
> +    'driver': 'compress',
> +    'file': {'driver': '$IMGFMT',
> +             'file': {'driver': 'file',
> +                      'filename': '$TEST_IMG'}}}" | \
> +                          _filter_qemu_io | _filter_testdir
> +
> +sizeB=$($QEMU_IMG info --output=json "$TEST_IMG" |
> +        sed -n '/"actual-size":/ s/[^0-9]//gp')
> +
> +if [ $sizeA -le $sizeB ]
> +then
> +    echo "Compression ERROR"
> +fi
> +
> +$QEMU_IMG check --output=json "$TEST_IMG" |
> +          sed -n 's/,$//; /"compressed-clusters":/ s/^ *//p'
> +
>   # success, all done
>   echo '*** done'
>   rm -f $seq.full
> diff --git a/tests/qemu-iotests/214.out b/tests/qemu-iotests/214.out
> index 0fcd8dc..4a2ec33 100644
> --- a/tests/qemu-iotests/214.out
> +++ b/tests/qemu-iotests/214.out
> @@ -32,4 +32,18 @@ read 4194304/4194304 bytes at offset 0
>   4 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
>   read 4194304/4194304 bytes at offset 4194304
>   4 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> +
> +=== Write compressed data of multiple clusters ===
> +
> +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152
> +Write uncompressed data:
> +wrote 524288/524288 bytes at offset 0
> +512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152
> +Write compressed data:
> +wrote 229376/229376 bytes at offset 0
> +224 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> +wrote 229376/229376 bytes at offset 262144
> +224 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> +"compressed-clusters": 8
>   *** done
> 


-- 
Best regards,
Vladimir