Skip to content

qcow2-bitmaps: rewrite reopening logic

Vladimir Sementsov-Ogievskiy qemu-devel 5 versions – Applied

Status from this message: Thanks, applied to my bitmaps tree:

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v5 Latest9 patches 4 repliesApplied
  2. v410 patches 23 repliesSuperseded
  3. v39 patches 7 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v29 patches9 repliesSuperseded
v13 patches13 repliesSuperseded

Changes in v5 from the cover letter

01: - add Max's r-b
- fix s/QSIMPLE_INIT/QTAILQ_INIT/ in a comment
02: - add Max's and John's a-b
03: - improve test to check bitmap hashes in more safe way 07: - drop wrong statement from commit message
- log events by hand
08: - drop 'the' from comment
- add Corruption in case of existent IN_USE on RO->RW reopen
09: - add Max's a-b and John's r-b

Patches in v5 Applied

#Subject and filesSizeRepliesApplied
1/9block: switch reopen queue from QSIMPLEQ to QTAILQblock.c include/block/block.h+13 -130 replies
2/9block: reverse order for reopen commitsblock.c+9 -30 replies
3/9iotests: add test-case to 165 to test reopening qcow2 bitmaps to RWtests/qemu-iotests/165 tests/qemu-iotests/165.out+57 -41 reply
4/9block/qcow2-bitmap: get rid of bdrv_has_changed_persistent_bitmapsblock/dirty-bitmap.c block/qcow2-bitmap.c include/block/dirty-bitmap.h+13 -230 replies
5/9block/qcow2-bitmap: drop qcow2_reopen_bitmaps_rw_hint()block/qcow2-bitmap.c block/qcow2.h+1 -160 replies
6/9block/qcow2-bitmap: do not remove bitmaps on reopen-roblock/qcow2-bitmap.c block/qcow2.c block/qcow2.h+37 -170 replies
7/9iotests: add test 260 to check bitmap life after snapshot + committests/qemu-iotests/260 tests/qemu-iotests/260.out tests/qemu-iotests/group+142 -00 replies
8/9block/qcow2-bitmap: fix and improve qcow2_reopen_bitmaps_rwblock/qcow2-bitmap.c+58 -190 replies
9/9qcow2-bitmap: move bitmap reopen-rw code to qcow2_reopen_commitblock.c block/qcow2.c include/block/block_int.h+14 -260 replies

Reviews trailers per patch

7 of 9 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchMax ReitzJohn Snow
SeriesR-b
1/9R-b
2/9A-b A-b
3/9R-b
4/9R-b
5/9R-b
6/9R-b
7/9
8/9
9/9A-b R-b

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

Read the v5 thread

Cover letter [PATCH v5 0/9] qcow2-bitmaps: rewrite reopening logic

Hi all!

Bitmaps reopening is buggy, reopening-rw just not working at all and reopening-ro may lead to producing broken incremental backup if we do temporary snapshot in a meantime.

v5:
01: - add Max's r-b
- fix s/QSIMPLE_INIT/QTAILQ_INIT/ in a comment
02: - add Max's and John's a-b
03: - improve test to check bitmap hashes in more safe way 07: - drop wrong statement from commit message
- log events by hand
08: - drop 'the' from comment
- add Corruption in case of existent IN_USE on RO->RW reopen
09: - add Max's a-b and John's r-b

v4: Drop complicated solution around reopening logic [Kevin], fix
the existing bug in a simplest way

Vladimir Sementsov-Ogievskiy (9):
block: switch reopen queue from QSIMPLEQ to QTAILQ
block: reverse order for reopen commits
iotests: add test-case to 165 to test reopening qcow2 bitmaps to RW block/qcow2-bitmap: get rid of bdrv_has_changed_persistent_bitmaps block/qcow2-bitmap: drop qcow2_reopen_bitmaps_rw_hint() block/qcow2-bitmap: do not remove bitmaps on reopen-ro
iotests: add test 260 to check bitmap life after snapshot + commit block/qcow2-bitmap: fix and improve qcow2_reopen_bitmaps_rw
qcow2-bitmap: move bitmap reopen-rw code to qcow2_reopen_commit

 block/qcow2.h                |   5 +-
 include/block/block.h        |   2 +-
 include/block/block_int.h    |   6 --
 include/block/dirty-bitmap.h |   1 -
 block.c                      |  53 +++++------
 block/dirty-bitmap.c         |  12 ---
 block/qcow2-bitmap.c         | 164 ++++++++++++++++++++++-------------
 block/qcow2.c                |  17 +++-
 tests/qemu-iotests/165       |  57 +++++++++++-
 tests/qemu-iotests/165.out   |   4 +-
 tests/qemu-iotests/260       |  89 +++++++++++++++++++
 tests/qemu-iotests/260.out   |  52 +++++++++++
 tests/qemu-iotests/group     |   1 +
 13 files changed, 343 insertions(+), 120 deletions(-)
 create mode 100755 tests/qemu-iotests/260
 create mode 100644 tests/qemu-iotests/260.out
Signature · 1 line
2.21.0