Commit d3192de7 authored by Eric Blake's avatar Eric Blake
Browse files

iotests: Tweak 221 sizing for different hole granularities 



For some particular configurations of ext4, sizing an image to 84
sectors + 1 byte causes test failures when the size of the hole is
rounded to a 4k alignment. Let's instead size things to 128 sectors +
1 byte, as the 64k boundary is more likely to work with various hole
granularities.

Reported-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Message-Id: <20190506172111.31594-1-eblake@redhat.com>
Tested-by: default avatarThomas Huth <thuth@redhat.com>
parent e74ee02c

tests/qemu-iotests/221

+5 −5
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#

# Test qemu-img vs. unaligned images

#

# Copyright (C) 2018 Red Hat, Inc.

# Copyright (C) 2018-2019 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
@@ -41,16 +41,16 @@ echo 
echo "=== Check mapping of unaligned raw image ==="

echo



_make_test_img 43009 # qemu-img create rounds size up

_make_test_img 65537 # qemu-img create rounds size up

$QEMU_IMG map --output=json "$TEST_IMG" | _filter_qemu_img_map



truncate --size=43009 "$TEST_IMG" # so we resize it and check again

truncate --size=65537 "$TEST_IMG" # so we resize it and check again

$QEMU_IMG map --output=json "$TEST_IMG" | _filter_qemu_img_map



$QEMU_IO -c 'w 43008 1' "$TEST_IMG" | _filter_qemu_io # writing also rounds up

$QEMU_IO -c 'w 65536 1' "$TEST_IMG" | _filter_qemu_io # writing also rounds up

$QEMU_IMG map --output=json "$TEST_IMG" | _filter_qemu_img_map



truncate --size=43009 "$TEST_IMG" # so we resize it and check again

truncate --size=65537 "$TEST_IMG" # so we resize it and check again

$QEMU_IMG map --output=json "$TEST_IMG" | _filter_qemu_img_map



# success, all done

tests/qemu-iotests/221.out

+10 −10
Original line number Diff line number Diff line
@@ -2,15 +2,15 @@ QA output created by 221 


=== Check mapping of unaligned raw image ===



Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=43009

[{ "start": 0, "length": 43520, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]

[{ "start": 0, "length": 43520, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]

wrote 1/1 bytes at offset 43008

Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=65537

[{ "start": 0, "length": 66048, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]

[{ "start": 0, "length": 66048, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]

wrote 1/1 bytes at offset 65536

1 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

[{ "start": 0, "length": 40960, "depth": 0, "zero": true, "data": false, "offset": OFFSET},

{ "start": 40960, "length": 2049, "depth": 0, "zero": false, "data": true, "offset": OFFSET},

{ "start": 43009, "length": 511, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]

[{ "start": 0, "length": 40960, "depth": 0, "zero": true, "data": false, "offset": OFFSET},

{ "start": 40960, "length": 2049, "depth": 0, "zero": false, "data": true, "offset": OFFSET},

{ "start": 43009, "length": 511, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]

[{ "start": 0, "length": 65536, "depth": 0, "zero": true, "data": false, "offset": OFFSET},

{ "start": 65536, "length": 1, "depth": 0, "zero": false, "data": true, "offset": OFFSET},

{ "start": 65537, "length": 511, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]

[{ "start": 0, "length": 65536, "depth": 0, "zero": true, "data": false, "offset": OFFSET},

{ "start": 65536, "length": 1, "depth": 0, "zero": false, "data": true, "offset": OFFSET},

{ "start": 65537, "length": 511, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]

*** done