| Message ID | 20240612144228.1179240-1-peterx@redhat.com |
|---|---|
| Headers | show |
| Series | migration: New postcopy state, and some cleanups | expand |
On Wed, Jun 12, 2024 at 10:42:24AM -0400, Peter Xu wrote: > The major goal of this patchset is patch 4, which introduced a new postcopy > state so that we will send an event in postcopy reconnect failures that > Libvirt would prefer to have. There's more information for that issue in > the commit message alone. > > Patch 1-2 are cleanups that are not directly relevant but I found/stored > that could be good to have. I made it simple by putting them together in > one thread to make patch management easier, but I can send them separately > when necessary. > > Patch 3 is also a cleanup, but will be needed for patch 4 as dependency. > > Comments welcomed, thanks. > > CI: https://gitlab.com/peterx/qemu/-/pipelines/1328309702 > (msys2-64bit is failing, but doesn't look relevant) I forgot to update the doc file, I'll attach one more patch when repost, attached here for early comments. I also forgot to copy QAPI maintainers; It turns out I start to forget how to send patches.. sorry. I'll do that in v2. ===8<=== From b4693c1576fb3741ca25962bd91f31c2afb60863 Mon Sep 17 00:00:00 2001 From: Peter Xu <peterx@redhat.com> Date: Wed, 12 Jun 2024 11:18:27 -0400 Subject: [PATCH] migration/docs: Update postcopy recover session for SETUP phase Firstly, the "Paused" state was added in the wrong place before. The state machine section was describing PostcopyState, rather than MigrationStatus. Drop the Paused state descriptions. Then in the postcopy recover session, add more information on the state machine for MigrationStatus in the lines. Add the new RECOVER_SETUP phase. Signed-off-by: Peter Xu <peterx@redhat.com> --- docs/devel/migration/postcopy.rst | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/docs/devel/migration/postcopy.rst b/docs/devel/migration/postcopy.rst index 6c51e96d79..a15594e11f 100644 --- a/docs/devel/migration/postcopy.rst +++ b/docs/devel/migration/postcopy.rst @@ -99,17 +99,6 @@ ADVISE->DISCARD->LISTEN->RUNNING->END (although it can't do the cleanup it would do as it finishes a normal migration). - - Paused - - Postcopy can run into a paused state (normally on both sides when - happens), where all threads will be temporarily halted mostly due to - network errors. When reaching paused state, migration will make sure - the qemu binary on both sides maintain the data without corrupting - the VM. To continue the migration, the admin needs to fix the - migration channel using the QMP command 'migrate-recover' on the - destination node, then resume the migration using QMP command 'migrate' - again on source node, with resume=true flag set. - - End The listen thread can now quit, and perform the cleanup of migration @@ -221,7 +210,8 @@ paused postcopy migration. The recovery phase normally contains a few steps: - - When network issue occurs, both QEMU will go into PAUSED state + - When network issue occurs, both QEMU will go into **POSTCOPY_PAUSED** + migration state. - When the network is recovered (or a new network is provided), the admin can setup the new channel for migration using QMP command @@ -229,9 +219,20 @@ The recovery phase normally contains a few steps: - On source host, the admin can continue the interrupted postcopy migration using QMP command 'migrate' with resume=true flag set. - - - After the connection is re-established, QEMU will continue the postcopy - migration on both sides. + Source QEMU will go into **POSTCOPY_RECOVER_SETUP** state trying to + re-establish the channels. + + - When both sides of QEMU successfully reconnects using a new or fixed up + channel, they will go into **POSTCOPY_RECOVER** state, some handshake + procedure will be needed to properly synchronize the VM states between + the two QEMUs to continue the postcopy migration. For example, there + can be pages sent right during the window when the network is + interrupted, then the handshake will guarantee pages lost in-flight + will be resent again. + + - After a proper handshake synchronization, QEMU will continue the + postcopy migration on both sides and go back to **POSTCOPY_ACTIVE** + state. Postcopy migration will continue. During a paused postcopy migration, the VM can logically still continue running, and it will not be impacted from any page access to pages that
The major goal of this patchset is patch 4, which introduced a new postcopy state so that we will send an event in postcopy reconnect failures that Libvirt would prefer to have. There's more information for that issue in the commit message alone. Patch 1-2 are cleanups that are not directly relevant but I found/stored that could be good to have. I made it simple by putting them together in one thread to make patch management easier, but I can send them separately when necessary. Patch 3 is also a cleanup, but will be needed for patch 4 as dependency. Comments welcomed, thanks. CI: https://gitlab.com/peterx/qemu/-/pipelines/1328309702 (msys2-64bit is failing, but doesn't look relevant) Peter Xu (4): migration/multifd: Avoid the final FLUSH in complete() migration: Rename thread debug names migration: Use MigrationStatus instead of int migration/postcopy: Add postcopy-recover-setup phase qapi/migration.json | 4 ++ migration/migration.h | 9 +++-- migration/postcopy-ram.h | 3 ++ migration/colo.c | 2 +- migration/migration.c | 85 ++++++++++++++++++++++++++++++++-------- migration/multifd.c | 6 +-- migration/postcopy-ram.c | 10 ++++- migration/ram.c | 4 -- migration/savevm.c | 6 +-- 9 files changed, 95 insertions(+), 34 deletions(-)