On 8/15/19 11:36 AM, Max Reitz wrote:
> I made the mistake of trying to run the iotests with all non-default
> subformats our vmdk driver has to offer:
> - monolithicFlat
> - twoGbMaxExtentSparse
> - twoGbMaxExtentFlat
> - streamOptimized
>
> Many things broke, so this series fixes what I found. It’s mostly just
> iotest fixes, but there are actually two real fixes in here.
>
>
> v2:
> - Patch 2: Don’t treat extent filenames with protocol prefixes as
> absolute filenames – this may be the right thing to do, but:
> (1) path_combine() doesn’t (it just ignores whether the supposed
> relative filename has a potential protocol prefix), so this is how
> we handled it so far,
> (2) It would break other cases (when a filename contains a colon for
> no particular reason), as seen in iotest 126.
> That means you cannot have an extent file e.g. on an http server while
> the descriptor is on a local filesystem, but I hope nobody would ever
> want to do that.
>
I guess we'll fix it if it comes up.
> - Patch 3: Fix paste-o [John]
>
> - Patch 7: twoGbMaxExtentSparse works now with the change to patch 2, so
> we no longer have to mark it unsupported [Thanks for the insistent
> inquiry, John :-)]
>
Thanks for fixing the "weird" formats!
Reviewed-by: John Snow <js...@redhat.com>
>
> git-backport-diff against v1:
>
> Key:
> [----] : patches are identical
> [####] : number of functional differences between upstream/downstream patch
> [down] : patch is downstream-only
> The flags [FC] indicate (F)unctional and (C)ontextual differences,
> respectively
>
> 001/7:[----] [--] 'iotests: Fix _filter_img_create()'
> 002/7:[0002] [FC] 'vmdk: Use bdrv_dirname() for relative extent paths'
> 003/7:[0002] [FC] 'iotests: Keep testing broken relative extent paths'
> 004/7:[----] [--] 'vmdk: Reject invalid compressed writes'
> 005/7:[----] [--] 'iotests: Disable broken streamOptimized tests'
> 006/7:[----] [--] 'iotests: Disable 110 for vmdk.twoGbMaxExtentSparse'
> 007/7:[0006] [FC] 'iotests: Disable 126 for some vmdk subformats'
>
>
> Max Reitz (7):
> iotests: Fix _filter_img_create()
> vmdk: Use bdrv_dirname() for relative extent paths
> iotests: Keep testing broken relative extent paths
> vmdk: Reject invalid compressed writes
> iotests: Disable broken streamOptimized tests
> iotests: Disable 110 for vmdk.twoGbMaxExtentSparse
> iotests: Disable 126 for flat vmdk subformats
>
> block/vmdk.c | 64 ++++++++++++++++++++++----------
> tests/qemu-iotests/002 | 1 +
> tests/qemu-iotests/003 | 1 +
> tests/qemu-iotests/005 | 3 +-
> tests/qemu-iotests/009 | 1 +
> tests/qemu-iotests/010 | 1 +
> tests/qemu-iotests/011 | 1 +
> tests/qemu-iotests/017 | 3 +-
> tests/qemu-iotests/018 | 3 +-
> tests/qemu-iotests/019 | 3 +-
> tests/qemu-iotests/020 | 3 +-
> tests/qemu-iotests/027 | 1 +
> tests/qemu-iotests/032 | 1 +
> tests/qemu-iotests/033 | 1 +
> tests/qemu-iotests/034 | 3 +-
> tests/qemu-iotests/037 | 3 +-
> tests/qemu-iotests/059 | 34 ++++++++++++++++-
> tests/qemu-iotests/059.out | 24 +++++++-----
> tests/qemu-iotests/063 | 3 +-
> tests/qemu-iotests/072 | 1 +
> tests/qemu-iotests/105 | 3 +-
> tests/qemu-iotests/110 | 3 +-
> tests/qemu-iotests/126 | 2 +
> tests/qemu-iotests/197 | 1 +
> tests/qemu-iotests/215 | 1 +
> tests/qemu-iotests/251 | 1 +
> tests/qemu-iotests/common.filter | 4 +-
> 27 files changed, 127 insertions(+), 43 deletions(-)
>
--
—js