migration: Don't try and recover return path in non-postcopy
PATCH 1/1 migration: Don't try and recover return path in non-postcopy
From: "Dr. David Alan Gilbert" <[email protected]>
In normal precopy we can't do reconnection recovery - but we also don't need to, since you can just rerun migration.
At the moment if the 'return-path' capability is on, we use the return path in precopy to give a postiive 'OK' to the end of migration; however if migration fails then we fall into the postcopy recovery path and hang. This fixes it by only running the return path in the postcopy case.
--- migration/migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
migration/migration.c +1 -1
@@ -2481,7 +2481,7 @@ retry: out: res =qemu_file_get_error (rp);if (res) { -if (res == -EIO ) { +if (res == -EIO &&migration_in_postcopy ()) {/* * Maybe there is something we can do: it looks like a * network down issue, and we pause for a recovery.
Signature · 1 line
2.21.0
Quoted 6 lines · On Mon, 7 Oct 2019 11:35:07 +0100 "Dr. David Alan Gilbert (git)"…
From: "Dr. David Alan Gilbert" <[email protected]>
In normal precopy we can't do reconnection recovery - but we also don't need to, since you can just rerun migration.
At the moment if the 'return-path' capability is on, we use the return path in precopy to give a postiive 'OK' to the end
s/postiive/positive
Quoted 7 lines
of migration; however if migration fails then we fall into the postcopy recovery path and hang. This fixes it by only running the return path in the postcopy case.
Reported-by Greg Kurz <[email protected]>Signed-off-by Dr. David Alan Gilbert <[email protected]>---
Thanks !
Quoted 16 lines
migration/migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)migration/migration.c +1
-1@@ -2481,7 +2481,7 @@ retry: out: res =qemu_file_get_error (rp);if (res) { -if (res == -EIO ) { +if (res == -EIO &&migration_in_postcopy ()) {/* * Maybe there is something we can do: it looks like a * network down issue, and we pause for a recovery.
Quoted 21 lines · Dr. David Alan Gilbert (git)
From: "Dr. David Alan Gilbert" <[email protected]>
In normal precopy we can't do reconnection recovery - but we also don't need to, since you can just rerun migration.
At the moment if the 'return-path' capability is on, we use the return path in precopy to give a postiive 'OK' to the end of migration; however if migration fails then we fall into the postcopy recovery path and hang. This fixes it by only running the return path in the postcopy case.Reported-by Greg Kurz <[email protected]>Signed-off-by Dr. David Alan Gilbert <[email protected]>--- migration/migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)migration/migration.c +0
-0
migration/migration.c retry: · line 2484
Quoted 5 lines
migration/migration.c +1
-1@@ -2481,7 +2481,7 @@ retry: out: res =qemu_file_get_error (rp);if (res) { -if (res == -EIO ) { +if (res == -EIO &&migration_in_postcopy ()) {
Makes sense! I saw that in qemu_loadvm_state_main() we're using (postcopy_state_get() == POSTCOPY_INCOMING_RUNNING) to check. That also makes sense because I think we can't really do the recover if the migration stream failed at status like POSTCOPY_INCOMING_DISCARD even if it switched to POSTCOPY_ACTIVE... However that should really be a very corner case even if it's true, and afaict it's nowhere worse...
Signature · 1 line
Peter Xu
Quoted 10 lines · * Dr. David Alan Gilbert (git) ([email protected]) wrote:
From: "Dr. David Alan Gilbert" <[email protected]>
In normal precopy we can't do reconnection recovery - but we also don't need to, since you can just rerun migration.
At the moment if the 'return-path' capability is on, we use the return path in precopy to give a postiive 'OK' to the end of migration; however if migration fails then we fall into the postcopy recovery path and hang. This fixes it by only running the return path in the postcopy case.
Quoted 2 lines
Reported-by Greg Kurz <[email protected]>Signed-off-by Dr. David Alan Gilbert <[email protected]>
Queued
Quoted 21 lines
--- migration/migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)migration/migration.c +1
-1@@ -2481,7 +2481,7 @@ retry: out: res =qemu_file_get_error (rp);if (res) { -if (res == -EIO ) { +if (res == -EIO &&migration_in_postcopy ()) {/* * Maybe there is something we can do: it looks like a * network down issue, and we pause for a recovery. Signature · 1 line
2.21.0
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK