Skip to content

Introduce 'yank' oob qmp command to recover from hanging qemu

Lukas Straub qemu-devel 15 versions – Applied

Status from this message: Queued. Thanks for persevering!

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v14 Latest7 patches 8 repliesApplied
  2. v137 patches 0 repliesSuperseded
  3. v127 patches 4 repliesSuperseded
Earlier versions · 12
VersionPostedPatchesRepliesStatus
v117 patches6 repliesSuperseded
v10 posting 2/28 patches4 repliesSuperseded
v10 posting 1/20 of 8 patches0 repliesSuperseded
v98 patches4 repliesSuperseded
v88 patches7 repliesSuperseded
v78 patches16 repliesSuperseded
v69 patches2 repliesSuperseded
v57 patches10 repliesSuperseded
v44 patches17 repliesSuperseded
v34 patches0 repliesSuperseded
v24 patches7 repliesSuperseded
v15 patches46 repliesSuperseded

Changes in v14 from the cover letter

-fix checkpatch.pl warning

Patches in v14 Applied

#Subject and filesSizeRepliesApplied
1/7Introduce yank featureMAINTAINERS include/qemu/yank.h qapi/meson.build +4 more+433 -05 replies
2/7block/nbd.c: Add yank featureblock/nbd.c+92 -610 replies
3/7chardev/char-socket.c: Add yank featurechardev/char-socket.c+34 -01 reply
4/7migration: Add yank featuremigration/channel.c migration/migration.c migration/multifd.c +2 more+57 -00 replies
5/7io/channel-tls.c: make qio_channel_tls_shutdown thread-safeio/channel-tls.c+4 -20 replies
6/7io: Document qmp oob suitability of qio_channel_shutdown and io_shutdowninclude/io/channel.h+4 -10 replies
7/7tests/test-char.c: Wait for the chardev to connect in char_socket_client_dupid_testtests/test-char.c+1 -00 replies

Reviews trailers per patch

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

PatchStefan HajnocziMarkus ArmbrusterEric BlakeDr. David Alan GilbertDaniel P. BerrangéMarc-André Lureau
1/7A-b R-b A-b
2/7A-b R-b
3/7A-b A-b
4/7A-b A-b
5/7A-b R-b
6/7A-b R-b
7/7R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 6 reviewers.

Read the v14 thread

Cover letter [PATCH v14 0/7] Introduce 'yank' oob qmp command to recover from hanging qemu

Hello Everyone,
So here is v14.

Changes:

v14:
-fix checkpatch.pl warning

v13:
-Address Marc-André Lureau comments:
-make yank_register_instance return bool -rename yank_compare_instances to yank_instance_equal -remove breaks
-use g_str_equal instead of strcmp
-use g_new0 instead of g_slice_new
-use QEMU_LOCK_GUARD instead of qemu_mutex_lock/unlock

v12:
-rebase onto master
-minor change to migration (removal of "defer" branch in qemu_start_incoming_migration)
-add Reviewed-by tags

v11:
-squashed MAINTAINERS update into patch 1
-move qmp doc of yank before misc
-add title for qmp docs
-change "Since:" to 6.0
-add Reviewed-by tags

v10:
-moved from qapi/misc.json to qapi/yank.json
-rename 'blockdev' -> 'block-node'
-document difference betwen migration yank instance and migrate_cancel -better document return values of yank command
-better document yank_lock
-minor style and spelling fixes

v9:
-rebase onto master
-implemented new qmp api as proposed by Markus

v8:
-add Reviewed-by and Acked-by tags
-rebase onto master
-minor change to migration
-convert to meson
-change "Since:" to 5.2
-varios code style fixes (Markus Armbruster)
-point to oob restrictions in comment to yank_register_function
(Markus Armbruster)
-improve qmp documentation (Markus Armbruster)
-document oob suitability of qio_channel and io_shutdown (Markus Armbruster)

v7:
-yank_register_instance now returns error via Error **errp instead of aborting -dropped "chardev/char.c: Check for duplicate id before creating chardev"

v6:
-add Reviewed-by and Acked-by tags
-rebase on master
-lots of changes in nbd due to rebase
-only take maintainership of util/yank.c and include/qemu/yank.h (Daniel P. Berrangé) -fix a crash discovered by the newly added chardev test
-fix the test itself

v5:
-move yank.c to util/
-move yank.h to include/qemu/
-add license to yank.h
-use const char*
-nbd: use atomic_store_release and atomic_load_aqcuire -io-channel: ensure thread-safety and document it -add myself as maintainer for yank

v4:
-fix build errors...

v3:
-don't touch softmmu/vl.c, use __contructor__ attribute instead (Paolo Bonzini) -fix build errors
-rewrite migration patch so it actually passes all tests

v2:
-don't touch io/ code anymore
-always register yank functions
-'yank' now takes a list of instances to yank -'query-yank' returns a list of yankable instances

Overview:
Hello Everyone,
In many cases, if qemu has a network connection (qmp, migration, chardev, etc.) to some other server and that server dies or hangs, qemu hangs too. These patches introduce the new 'yank' out-of-band qmp command to recover from these kinds of hangs. The different subsystems register callbacks which get executed with the yank command. For example the callback can shutdown() a socket. This is intended for the colo use-case, but it can be used for other things too of course.

Regards,
Lukas Straub

Lukas Straub (7):
Introduce yank feature
block/nbd.c: Add yank feature chardev/char-socket.c: Add yank feature
migration: Add yank feature
io/channel-tls.c: make qio_channel_tls_shutdown thread-safe
io: Document qmp oob suitability of qio_channel_shutdown and
io_shutdown
tests/test-char.c: Wait for the chardev to connect in
char_socket_client_dupid_test

 MAINTAINERS                   |   7 ++
 block/nbd.c                   | 153 +++++++++++++++----------
 chardev/char-socket.c         |  34 ++++++
 include/io/channel.h          |   5 +-
 include/qemu/yank.h           |  97 ++++++++++++++++
 io/channel-tls.c              |   6 +-
 migration/channel.c           |  13 +++
 migration/migration.c         |  22 ++++
 migration/multifd.c           |  10 ++
 migration/qemu-file-channel.c |   7 ++
 migration/savevm.c            |   5 +
 qapi/meson.build              |   1 +
 qapi/qapi-schema.json         |   1 +
 qapi/yank.json                | 119 +++++++++++++++++++
 tests/test-char.c             |   1 +
 util/meson.build              |   1 +
 util/yank.c                   | 207 ++++++++++++++++++++++++++++++++++
 17 files changed, 625 insertions(+), 64 deletions(-)
 create mode 100644 include/qemu/yank.h
 create mode 100644 qapi/yank.json
 create mode 100644 util/yank.c

--
2.29.2