[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 04/11] migration: Cleanup incoming migration setup state chang
From: |
Peter Xu |
Subject: |
[PATCH v3 04/11] migration: Cleanup incoming migration setup state change |
Date: |
Wed, 19 Jun 2024 18:30:39 -0400 |
Destination QEMU can setup incoming ports for two purposes: either a fresh
new incoming migration, in which QEMU will switch to SETUP for channel
establishment, or a paused postcopy migration, in which QEMU will stay in
POSTCOPY_PAUSED until kicking off the RECOVER phase.
Now the state machine worked on dest node for the latter, only because
migrate_set_state() implicitly will become a noop if the current state
check failed. It wasn't clear at all.
Clean it up by providing a helper migration_incoming_state_setup() doing
proper checks over current status. Postcopy-paused will be explicitly
checked now, and then we can bail out for unknown states.
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Signed-off-by: Peter Xu <peterx@redhat.com>
---
migration/migration.c | 28 ++++++++++++++++++++++++++--
1 file changed, 26 insertions(+), 2 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 795b30f0d0..41a88fc50a 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -618,6 +618,29 @@ bool migrate_uri_parse(const char *uri, MigrationChannel
**channel,
return true;
}
+static bool
+migration_incoming_state_setup(MigrationIncomingState *mis, Error **errp)
+{
+ MigrationStatus current = mis->state;
+
+ if (current == MIGRATION_STATUS_POSTCOPY_PAUSED) {
+ /*
+ * Incoming postcopy migration will stay in PAUSED state even if
+ * reconnection happened.
+ */
+ return true;
+ }
+
+ if (current != MIGRATION_STATUS_NONE) {
+ error_setg(errp, "Illegal migration incoming state: %s",
+ MigrationStatus_str(current));
+ return false;
+ }
+
+ migrate_set_state(&mis->state, current, MIGRATION_STATUS_SETUP);
+ return true;
+}
+
static void qemu_start_incoming_migration(const char *uri, bool has_channels,
MigrationChannelList *channels,
Error **errp)
@@ -656,8 +679,9 @@ static void qemu_start_incoming_migration(const char *uri,
bool has_channels,
return;
}
- migrate_set_state(&mis->state, MIGRATION_STATUS_NONE,
- MIGRATION_STATUS_SETUP);
+ if (!migration_incoming_state_setup(mis, errp)) {
+ return;
+ }
if (addr->transport == MIGRATION_ADDRESS_TYPE_SOCKET) {
SocketAddress *saddr = &addr->u.socket;
--
2.45.0
- [PATCH v3 00/11] migration: New postcopy state, and some cleanups, Peter Xu, 2024/06/19
- [PATCH v3 01/11] migration/multifd: Avoid the final FLUSH in complete(), Peter Xu, 2024/06/19
- [PATCH v3 02/11] migration: Rename thread debug names, Peter Xu, 2024/06/19
- [PATCH v3 03/11] migration: Use MigrationStatus instead of int, Peter Xu, 2024/06/19
- [PATCH v3 04/11] migration: Cleanup incoming migration setup state change,
Peter Xu <=
- [PATCH v3 05/11] migration/postcopy: Add postcopy-recover-setup phase, Peter Xu, 2024/06/19
- [PATCH v3 07/11] tests/migration-tests: Drop most WIN32 ifdefs for postcopy failure tests, Peter Xu, 2024/06/19
- [PATCH v3 06/11] migration/docs: Update postcopy recover session for SETUP phase, Peter Xu, 2024/06/19
- [PATCH v3 08/11] tests/migration-tests: Always enable migration events, Peter Xu, 2024/06/19
- [PATCH v3 09/11] tests/migration-tests: migration_event_wait(), Peter Xu, 2024/06/19
- [PATCH v3 10/11] tests/migration-tests: Verify postcopy-recover-setup status, Peter Xu, 2024/06/19
- [PATCH v3 11/11] tests/migration-tests: Cover postcopy failure on reconnect, Peter Xu, 2024/06/19