Skip to content

qemu-img: Add salvaging mode to convert

Max Reitz qemu-devel 4 versions – Applied

Status from this message: Applied the series to my block branch, and fixed _filter_offsets in

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest7 patches 3 repliesApplied
  2. v37 patches 10 repliesSuperseded
  3. v26 patches 3 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v16 patches7 repliesSuperseded

Changes in v4 from the cover letter

- Patch 2: Rebase conflict (265a7e54efad246f4bde63f77aee6311f436f5f1)
- Patch 3: Fix enum prefix to be BLKDEBUG_IO_TYPE [Vladimir]
- Patch 5: The same
- Patch 6:
- 249 -> 251
- s%#!/bin/bash%#!/usr/bin/env bash% [Thomas]
- s/2018/2019/ [Vladimir]
- Drop here=$PWD [Vladimir]
- Clarified a comment (I hope) [Vladimir]

Patches in v4 Applied

#Subject and filesSizeRepliesApplied
1/7qemu-img: Move quiet into ImgConvertStateqemu-img.c+7 -60 replies
2/7qemu-img: Add salvaging mode to convertqemu-img-cmds.hx qemu-img.c qemu-img.texi+75 -230 replies
3/7blkdebug: Add @iotype error optionblock/blkdebug.c qapi/block-core.json+67 -90 replies
4/7blkdebug: Add "none" eventblock/blkdebug.c qapi/block-core.json+5 -10 replies
5/7blkdebug: Inject errors on .bdrv_co_block_status()block/blkdebug.c qapi/block-core.json+12 -10 replies
6/7iotests: Test qemu-img convert --salvagetests/qemu-iotests/251 tests/qemu-iotests/251.out tests/qemu-iotests/group+206 -02 replies
7/7iotests: Test qemu-img convert -C --salvagetests/qemu-iotests/082 tests/qemu-iotests/082.out+4 -00 replies

Reviews trailers per patch

All 7 patches have a Reviewed-by or Acked-by.

PatchVladimir Sementsov-OgievskiyEric Blake
1/7R-b R-b
2/7R-b
3/7R-b
4/7R-b
5/7R-b R-b
6/7T-b R-b
7/7T-b R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v4 thread

Cover letter [Qemu-devel] [PATCH v4 0/7] qemu-img: Add salvaging mode to convert

Hi,

This series adds a --salvage option to qemu-img convert. With this, qemu-img will not abort when it encounters an I/O error. Instead, it tries to narrow it down and will treat the affected sectors as being completely 0 (and print a warning).

Testing this is not so easy, because while real I/O errors during read operations should be treated as described above, errors encountered during bdrv_block_status() should just be ignored and the affected sectors should be considered allocated. But blkdebug does not yet have a way to intercept this, and:

(1) Just adding a new block-status event would be silly, because I don't want an event, I want it to fail on a certain kind of operation, on a certain sector range, independently of any events, so why can't we just do that? See patch 4.

(2) If we just make blkdebug intercept .bdrv_co_block_status() like all other kinds of operations, at least iotest 041 fails, which does exactly that silly thing: It uses the read_aio event to wait for any read. But it turns out that there may be a bdrv_*block_status() call in between, so suddenly the wrong operation yields an error. As I said, the real fault here is that it does not really make sense to pray that the operation you want to fail is the one that is immediately executed after some event that you hope will trigger that operation.
See patch 3.

So patch 3 allows blkdebug users to select which kind of I/O operation they actually want to make fail, and patch 4 allows them to not use any event, but to have a rule active all the time.

Together, we can then enable error injection for block-status in patch 5 and make use of event=none iotype=block-status in patch 6.

v4:
- Patch 2: Rebase conflict (265a7e54efad246f4bde63f77aee6311f436f5f1)
- Patch 3: Fix enum prefix to be BLKDEBUG_IO_TYPE [Vladimir]
- Patch 5: The same
- Patch 6:
- 249 -> 251
- s%#!/bin/bash%#!/usr/bin/env bash% [Thomas]
- s/2018/2019/ [Vladimir]
- Drop here=$PWD [Vladimir]
- Clarified a comment (I hope) [Vladimir]

git-backport-diff against v3:

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:[----] [--] 'qemu-img: Move quiet into ImgConvertState' 002/7:[0006] [FC] 'qemu-img: Add salvaging mode to convert' 003/7:[0028] [FC] 'blkdebug: Add @iotype error option' 004/7:[----] [--] 'blkdebug: Add "none" event'
005/7:[0002] [FC] 'blkdebug: Inject errors on .bdrv_co_block_status()' 006/7:[0015] [FC] 'iotests: Test qemu-img convert --salvage' 007/7:[----] [--] 'iotests: Test qemu-img convert -C --salvage'

Max Reitz (7):
qemu-img: Move quiet into ImgConvertState
qemu-img: Add salvaging mode to convert
blkdebug: Add @iotype error option
blkdebug: Add "none" event
blkdebug: Inject errors on .bdrv_co_block_status()
iotests: Test qemu-img convert --salvage
iotests: Test qemu-img convert -C --salvage

 qapi/block-core.json       |  33 +++++++-
 block/blkdebug.c           |  60 +++++++++++---
 qemu-img.c                 | 103 ++++++++++++++++-------
 qemu-img-cmds.hx           |   4 +-
 qemu-img.texi              |   4 +
 tests/qemu-iotests/082     |   1 +
 tests/qemu-iotests/082.out |   3 +
 tests/qemu-iotests/251     | 162 +++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/251.out |  43 ++++++++++
 tests/qemu-iotests/group   |   1 +
 10 files changed, 375 insertions(+), 39 deletions(-)
 create mode 100755 tests/qemu-iotests/251
 create mode 100644 tests/qemu-iotests/251.out
Signature · 1 line
2.20.1