Skip to contentSkip to conversation

migration: Two fixes around yank and postcopy recovery

PATCH In review Peter Xu 3 participants 8 messages Jun 29, 2021 – Jun 30, 2021

lore
Share & tools
lore

Peter Xu

author
#0 lore raw

cover migration: Two fixes around yank and postcopy recovery

The 1st patch should fix yank with unregister instance; I think it should also fix the issue that Leonardo used to fix in this patch:

https://lore.kernel.org/qemu-devel/[email protected]/

The 2nd patch fixes postcopy recovery cannot retry if e.g. the 1st attempt provided a wrong port address.

Note that the multifd zstd test may fail if run migration-test with sudo on master (which seems to be a known issue now), and it'll still fail after these two patches applied, however all running tests keep usual.

(Leo: please let me know if this series didn't fix the issue you used to fix)

Please review, thanks.

Peter Xu (2):
migration: Move yank outside qemu_start_incoming_migration()
migration: Allow reset of postcopy_recover_triggered when failed

 migration/migration.c | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)
Signature · 1 line
2.31.1
author
#1 lore raw

PATCH 1/2 migration: Move yank outside qemu_start_incoming_migration()

Starting from commit b5eea99ec2f5c, qmp_migrate_recover() calls unregister before calling qemu_start_incoming_migration(). I believe it wanted to mitigate the next call to yank_register_instance(), but I think that's wrong.

Firstly, if during recover, we should keep the yank instance there, not "quickly removing and adding it back".

Meanwhile, calling qmp_migrate_recover() twice with b5eea99ec2f5c will directly crash the dest qemu (right now it can't; but it'll start to work right after the next patch) because the 1st call of qmp_migrate_recover() will unregister permanently when the channel failed to establish, then the 2nd call of qmp_migrate_recover() crashes at yank_unregister_instance().

This patch fixes it by moving yank ops out of qemu_start_incoming_migration() into qmp_migrate_incoming. For qmp_migrate_recover(), drop the unregister of yank instance too since we keep it there during the recovery phase.

---
 migration/migration.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
migration/migration.c +5 -6
index 4228635d18..1bb03d1eca 100644
@@ -456,10 +456,6 @@ static void qemu_start_incoming_migration(const char *uri, Error **errp)
 {
     const char *p = NULL;
 
-    if (!yank_register_instance(MIGRATION_YANK_INSTANCE, errp)) {
-        return;
-    }
-
     qapi_event_send_migration(MIGRATION_STATUS_SETUP);
     if (strstart(uri, "tcp:", &p) ||
         strstart(uri, "unix:", NULL) ||
@@ -474,7 +470,6 @@ static void qemu_start_incoming_migration(const char *uri, Error **errp)
     } else if (strstart(uri, "fd:", &p)) {
         fd_start_incoming_migration(p, errp);
     } else {
-        yank_unregister_instance(MIGRATION_YANK_INSTANCE);
         error_setg(errp, "unknown migration protocol: %s", uri);
     }
 }
@@ -2083,9 +2078,14 @@ void qmp_migrate_incoming(const char *uri, Error **errp)
         return;
     }
 
+    if (!yank_register_instance(MIGRATION_YANK_INSTANCE, errp)) {
+        return;
+    }
+
     qemu_start_incoming_migration(uri, &local_err);
 
     if (local_err) {
+        yank_unregister_instance(MIGRATION_YANK_INSTANCE);
         error_propagate(errp, local_err);
         return;
     }
@@ -2114,7 +2114,6 @@ void qmp_migrate_recover(const char *uri, Error **errp)
      * only re-setup the migration stream and poke existing migration
      * to continue using that newly established channel.
      */
-    yank_unregister_instance(MIGRATION_YANK_INSTANCE);
     qemu_start_incoming_migration(uri, errp);
 }
 
Signature · 1 line
2.31.1
Reviewed-by on v1 1/2
#2 lore raw

Re: [PATCH 1/2] migration: Move yank outside qemu_start_incoming_migration()

Quoted 13 lines · * Peter Xu ([email protected]) wrote:

Starting from commit b5eea99ec2f5c, qmp_migrate_recover() calls unregister before calling qemu_start_incoming_migration(). I believe it wanted to mitigate the next call to yank_register_instance(), but I think that's wrong.

Firstly, if during recover, we should keep the yank instance there, not "quickly removing and adding it back".

Meanwhile, calling qmp_migrate_recover() twice with b5eea99ec2f5c will directly crash the dest qemu (right now it can't; but it'll start to work right after the next patch) because the 1st call of qmp_migrate_recover() will unregister permanently when the channel failed to establish, then the 2nd call of qmp_migrate_recover() crashes at yank_unregister_instance().

Quoted 5 lines

This patch fixes it by moving yank ops out of qemu_start_incoming_migration() into qmp_migrate_incoming. For qmp_migrate_recover(), drop the unregister of yank instance too since we keep it there during the recovery phase.

Quoted 53 lines
---
 migration/migration.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
migration/migration.c +5 -6
index 4228635d18..1bb03d1eca 100644
@@ -456,10 +456,6 @@ static void qemu_start_incoming_migration(const char *uri, Error **errp)
 {
     const char *p = NULL;
 
-    if (!yank_register_instance(MIGRATION_YANK_INSTANCE, errp)) {
-        return;
-    }
-
     qapi_event_send_migration(MIGRATION_STATUS_SETUP);
     if (strstart(uri, "tcp:", &p) ||
         strstart(uri, "unix:", NULL) ||
@@ -474,7 +470,6 @@ static void qemu_start_incoming_migration(const char *uri, Error **errp)
     } else if (strstart(uri, "fd:", &p)) {
         fd_start_incoming_migration(p, errp);
     } else {
-        yank_unregister_instance(MIGRATION_YANK_INSTANCE);
         error_setg(errp, "unknown migration protocol: %s", uri);
     }
 }
@@ -2083,9 +2078,14 @@ void qmp_migrate_incoming(const char *uri, Error **errp)
         return;
     }
 
+    if (!yank_register_instance(MIGRATION_YANK_INSTANCE, errp)) {
+        return;
+    }
+
     qemu_start_incoming_migration(uri, &local_err);
 
     if (local_err) {
+        yank_unregister_instance(MIGRATION_YANK_INSTANCE);
         error_propagate(errp, local_err);
         return;
     }
@@ -2114,7 +2114,6 @@ void qmp_migrate_recover(const char *uri, Error **errp)
      * only re-setup the migration stream and poke existing migration
      * to continue using that newly established channel.
      */
-    yank_unregister_instance(MIGRATION_YANK_INSTANCE);
     qemu_start_incoming_migration(uri, errp);
 }
 
Signature · 1 line
2.31.1
Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK
author
#3 lore raw

PATCH 2/2 migration: Allow reset of postcopy_recover_triggered when failed

In reply to Peter Xu

It's possible qemu_start_incoming_migration() failed at any point, when it happens we should reset postcopy_recover_triggered to false so that the user can still retry with a saner incoming port.

---
 migration/migration.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)
migration/migration.c +13 -0
index 1bb03d1eca..fcca289ef7 100644
@@ -2097,6 +2097,13 @@ void qmp_migrate_recover(const char *uri, Error **errp)
 {
     MigrationIncomingState *mis = migration_incoming_get_current();
 
+    /*
+     * Don't even bother to use ERRP_GUARD() as it _must_ always be set by
+     * callers (no one should ignore a recover failure); if there is, it's a
+     * programming error.
+     */
+    assert(errp);
+
     if (mis->state != MIGRATION_STATUS_POSTCOPY_PAUSED) {
         error_setg(errp, "Migrate recover can only be run "
                    "when postcopy is paused.");
@@ -2115,6 +2122,12 @@ void qmp_migrate_recover(const char *uri, Error **errp)
      * to continue using that newly established channel.
      */
     qemu_start_incoming_migration(uri, errp);
+
+    /* Safe to dereference with the assert above */
+    if (*errp) {
+        /* Reset the flag so user could still retry */
+        qatomic_set(&mis->postcopy_recover_triggered, false);
+    }
 }
 
 void qmp_migrate_pause(Error **errp)
Signature · 1 line
2.31.1
Reviewed-by on v1 2/2
#4 lore raw

Re: [PATCH 2/2] migration: Allow reset of postcopy_recover_triggered when failed

Quoted 5 lines · * Peter Xu ([email protected]) wrote:

It's possible qemu_start_incoming_migration() failed at any point, when it happens we should reset postcopy_recover_triggered to false so that the user can still retry with a saner incoming port.

Quoted 38 lines
---
 migration/migration.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)
migration/migration.c +13 -0
index 1bb03d1eca..fcca289ef7 100644
@@ -2097,6 +2097,13 @@ void qmp_migrate_recover(const char *uri, Error **errp)
 {
     MigrationIncomingState *mis = migration_incoming_get_current();
 
+    /*
+     * Don't even bother to use ERRP_GUARD() as it _must_ always be set by
+     * callers (no one should ignore a recover failure); if there is, it's a
+     * programming error.
+     */
+    assert(errp);
+
     if (mis->state != MIGRATION_STATUS_POSTCOPY_PAUSED) {
         error_setg(errp, "Migrate recover can only be run "
                    "when postcopy is paused.");
@@ -2115,6 +2122,12 @@ void qmp_migrate_recover(const char *uri, Error **errp)
      * to continue using that newly established channel.
      */
     qemu_start_incoming_migration(uri, errp);
+
+    /* Safe to dereference with the assert above */
+    if (*errp) {
+        /* Reset the flag so user could still retry */
+        qatomic_set(&mis->postcopy_recover_triggered, false);
+    }
 }
 
 void qmp_migrate_pause(Error **errp)
Signature · 1 line
2.31.1
Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK
author
#5 lore raw
In reply to Peter Xu
Quoted 3 lines · Peter Xu

Note that the multifd zstd test may fail if run migration-test with sudo on master (which seems to be a known issue now), and it'll still fail after these two patches applied, however all running tests keep usual.

There's an unexpected accident; please ignore this paragraph as zstd test actually passes with/without the patchset applied.

Signature · 1 line
Peter Xu
#6 lore raw
In reply to Peter Xu
Quoted 6 lines · Peter Xu

The 1st patch should fix yank with unregister instance; I think it should also fix the issue that Leonardo used to fix in this patch:

https://lore.kernel.org/qemu-devel/[email protected]/

Quoted 8 lines

The 2nd patch fixes postcopy recovery cannot retry if e.g. the 1st attempt provided a wrong port address.

Note that the multifd zstd test may fail if run migration-test with sudo on master (which seems to be a known issue now), and it'll still fail after these two patches applied, however all running tests keep usual.

(Leo: please let me know if this series didn't fix the issue you used to fix)

It does fix the issue, as far as I tested.

Quoted 14 lines

Please review, thanks.

Peter Xu (2):
migration: Move yank outside qemu_start_incoming_migration()
migration: Allow reset of postcopy_recover_triggered when failed

 migration/migration.c | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

--
2.31.1

author
#7 lore raw
Quoted 3 lines · Leonardo Bras Soares Passos
Quoted 1 line

(Leo: please let me know if this series didn't fix the issue you used to fix)

It does fix the issue, as far as I tested.

Thanks, Leo!

Signature · 1 line
Peter Xu