|
 |
4841a6 |
From f5be3d8a5944679c1239b974e0f910f1afe4f532 Mon Sep 17 00:00:00 2001
|
|
|
4841a6 |
From: Peter Xu <peterx@redhat.com>
|
|
|
4841a6 |
Date: Thu, 31 Mar 2022 11:08:45 -0400
|
|
|
4841a6 |
Subject: [PATCH 28/37] migration: Allow migrate-recover to run multiple times
|
|
|
4841a6 |
MIME-Version: 1.0
|
|
|
4841a6 |
Content-Type: text/plain; charset=UTF-8
|
|
|
4841a6 |
Content-Transfer-Encoding: 8bit
|
|
|
4841a6 |
|
|
|
4841a6 |
RH-Author: Peter Xu <peterx@redhat.com>
|
|
|
4841a6 |
RH-MergeRequest: 195: migration: Allow migrate-recover to run multiple times
|
|
|
4841a6 |
RH-Commit: [2/2] a2e6b02007a06c9c7f5237289095811c7d7ca1f1
|
|
|
4841a6 |
RH-Bugzilla: 2097652
|
|
|
4841a6 |
RH-Acked-by: Leonardo Brás <leobras@redhat.com>
|
|
|
4841a6 |
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
4841a6 |
RH-Acked-by: Hanna Reitz <hreitz@redhat.com>
|
|
|
4841a6 |
|
|
|
4841a6 |
Previously migration didn't have an easy way to cleanup the listening
|
|
|
4841a6 |
transport, migrate recovery only allows to execute once. That's done with a
|
|
|
4841a6 |
trick flag in postcopy_recover_triggered.
|
|
|
4841a6 |
|
|
|
4841a6 |
Now the facility is already there.
|
|
|
4841a6 |
|
|
|
4841a6 |
Drop postcopy_recover_triggered and instead allows a new migrate-recover to
|
|
|
4841a6 |
release the previous listener transport.
|
|
|
4841a6 |
|
|
|
4841a6 |
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
4841a6 |
Signed-off-by: Peter Xu <peterx@redhat.com>
|
|
|
4841a6 |
Message-Id: <20220331150857.74406-8-peterx@redhat.com>
|
|
|
4841a6 |
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
4841a6 |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
4841a6 |
(cherry picked from commit 08401c0426bc1a5ce4609afd1cda5dd39abbf9fa)
|
|
|
4841a6 |
Signed-off-by: Peter Xu <peterx@redhat.com>
|
|
|
4841a6 |
---
|
|
|
4841a6 |
migration/migration.c | 13 ++-----------
|
|
|
4841a6 |
migration/migration.h | 1 -
|
|
|
4841a6 |
migration/savevm.c | 3 ---
|
|
|
4841a6 |
3 files changed, 2 insertions(+), 15 deletions(-)
|
|
|
4841a6 |
|
|
|
4841a6 |
diff --git a/migration/migration.c b/migration/migration.c
|
|
|
4841a6 |
index b787a36789..616c3ff32e 100644
|
|
|
4841a6 |
--- a/migration/migration.c
|
|
|
4841a6 |
+++ b/migration/migration.c
|
|
|
4841a6 |
@@ -2158,11 +2158,8 @@ void qmp_migrate_recover(const char *uri, Error **errp)
|
|
|
4841a6 |
return;
|
|
|
4841a6 |
}
|
|
|
4841a6 |
|
|
|
4841a6 |
- if (qatomic_cmpxchg(&mis->postcopy_recover_triggered,
|
|
|
4841a6 |
- false, true) == true) {
|
|
|
4841a6 |
- error_setg(errp, "Migrate recovery is triggered already");
|
|
|
4841a6 |
- return;
|
|
|
4841a6 |
- }
|
|
|
4841a6 |
+ /* If there's an existing transport, release it */
|
|
|
4841a6 |
+ migration_incoming_transport_cleanup(mis);
|
|
|
4841a6 |
|
|
|
4841a6 |
/*
|
|
|
4841a6 |
* Note that this call will never start a real migration; it will
|
|
|
4841a6 |
@@ -2170,12 +2167,6 @@ void qmp_migrate_recover(const char *uri, Error **errp)
|
|
|
4841a6 |
* to continue using that newly established channel.
|
|
|
4841a6 |
*/
|
|
|
4841a6 |
qemu_start_incoming_migration(uri, errp);
|
|
|
4841a6 |
-
|
|
|
4841a6 |
- /* Safe to dereference with the assert above */
|
|
|
4841a6 |
- if (*errp) {
|
|
|
4841a6 |
- /* Reset the flag so user could still retry */
|
|
|
4841a6 |
- qatomic_set(&mis->postcopy_recover_triggered, false);
|
|
|
4841a6 |
- }
|
|
|
4841a6 |
}
|
|
|
4841a6 |
|
|
|
4841a6 |
void qmp_migrate_pause(Error **errp)
|
|
|
4841a6 |
diff --git a/migration/migration.h b/migration/migration.h
|
|
|
4841a6 |
index 243898e3be..0ae2133326 100644
|
|
|
4841a6 |
--- a/migration/migration.h
|
|
|
4841a6 |
+++ b/migration/migration.h
|
|
|
4841a6 |
@@ -103,7 +103,6 @@ struct MigrationIncomingState {
|
|
|
4841a6 |
struct PostcopyBlocktimeContext *blocktime_ctx;
|
|
|
4841a6 |
|
|
|
4841a6 |
/* notify PAUSED postcopy incoming migrations to try to continue */
|
|
|
4841a6 |
- bool postcopy_recover_triggered;
|
|
|
4841a6 |
QemuSemaphore postcopy_pause_sem_dst;
|
|
|
4841a6 |
QemuSemaphore postcopy_pause_sem_fault;
|
|
|
4841a6 |
|
|
|
4841a6 |
diff --git a/migration/savevm.c b/migration/savevm.c
|
|
|
4841a6 |
index 0bef031acb..b8382aaa64 100644
|
|
|
4841a6 |
--- a/migration/savevm.c
|
|
|
4841a6 |
+++ b/migration/savevm.c
|
|
|
4841a6 |
@@ -2568,9 +2568,6 @@ static bool postcopy_pause_incoming(MigrationIncomingState *mis)
|
|
|
4841a6 |
|
|
|
4841a6 |
assert(migrate_postcopy_ram());
|
|
|
4841a6 |
|
|
|
4841a6 |
- /* Clear the triggered bit to allow one recovery */
|
|
|
4841a6 |
- mis->postcopy_recover_triggered = false;
|
|
|
4841a6 |
-
|
|
|
4841a6 |
/*
|
|
|
4841a6 |
* Unregister yank with either from/to src would work, since ioc behind it
|
|
|
4841a6 |
* is the same
|
|
|
4841a6 |
--
|
|
|
4841a6 |
2.35.3
|
|
|
4841a6 |
|