From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: Laurent Vivier <lvivier@redhat.com>,
Thomas Huth <thuth@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
libvir-list@redhat.com, Paolo Bonzini <pbonzini@redhat.com>,
Peter Xu <peterx@redhat.com>, Eric Blake <eblake@redhat.com>,
Juan Quintela <quintela@redhat.com>,
Leonardo Bras <leobras@redhat.com>,
Tejus GK <tejus.gk@nutanix.com>
Subject: [PATCH 18/26] migration: Update error description whenever migration fails
Date: Mon, 24 Jul 2023 15:06:31 +0200 [thread overview]
Message-ID: <20230724130639.93135-19-quintela@redhat.com> (raw)
In-Reply-To: <20230724130639.93135-1-quintela@redhat.com>
From: Tejus GK <tejus.gk@nutanix.com>
There are places in migration.c where the migration is marked failed with
MIGRATION_STATUS_FAILED, but the failure reason is never updated. Hence
libvirt doesn't know why the migration failed when it queries for it.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Tejus GK <tejus.gk@nutanix.com>
Message-ID: <20230621130940.178659-2-tejus.gk@nutanix.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/migration.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 1ea7512291..5528acb65e 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1689,7 +1689,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
if (!resume_requested) {
yank_unregister_instance(MIGRATION_YANK_INSTANCE);
}
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "uri",
+ error_setg(&local_err, QERR_INVALID_PARAMETER_VALUE, "uri",
"a valid migration protocol");
migrate_set_state(&s->state, MIGRATION_STATUS_SETUP,
MIGRATION_STATUS_FAILED);
@@ -2082,7 +2082,7 @@ migration_wait_main_channel(MigrationState *ms)
* Switch from normal iteration to postcopy
* Returns non-0 on error
*/
-static int postcopy_start(MigrationState *ms)
+static int postcopy_start(MigrationState *ms, Error **errp)
{
int ret;
QIOChannelBuffer *bioc;
@@ -2192,7 +2192,7 @@ static int postcopy_start(MigrationState *ms)
*/
ret = qemu_file_get_error(ms->to_dst_file);
if (ret) {
- error_report("postcopy_start: Migration stream errored (pre package)");
+ error_setg(errp, "postcopy_start: Migration stream errored (pre package)");
goto fail_closefb;
}
@@ -2229,7 +2229,7 @@ static int postcopy_start(MigrationState *ms)
ret = qemu_file_get_error(ms->to_dst_file);
if (ret) {
- error_report("postcopy_start: Migration stream errored");
+ error_setg(errp, "postcopy_start: Migration stream errored");
migrate_set_state(&ms->state, MIGRATION_STATUS_POSTCOPY_ACTIVE,
MIGRATION_STATUS_FAILED);
}
@@ -2750,6 +2750,7 @@ typedef enum {
static MigIterateState migration_iteration_run(MigrationState *s)
{
uint64_t must_precopy, can_postcopy;
+ Error *local_err = NULL;
bool in_postcopy = s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE;
bool can_switchover = migration_can_switchover(s);
@@ -2773,8 +2774,9 @@ static MigIterateState migration_iteration_run(MigrationState *s)
/* Still a significant amount to transfer */
if (!in_postcopy && must_precopy <= s->threshold_size && can_switchover &&
qatomic_read(&s->start_postcopy)) {
- if (postcopy_start(s)) {
- error_report("%s: postcopy failed to start", __func__);
+ if (postcopy_start(s, &local_err)) {
+ migrate_set_error(s, local_err);
+ error_report_err(local_err);
}
return MIG_ITERATE_SKIP;
}
@@ -3265,8 +3267,10 @@ void migrate_fd_connect(MigrationState *s, Error *error_in)
*/
if (migrate_postcopy_ram() || migrate_return_path()) {
if (open_return_path_on_source(s, !resume)) {
- error_report("Unable to open return-path for postcopy");
+ error_setg(&local_err, "Unable to open return-path for postcopy");
migrate_set_state(&s->state, s->state, MIGRATION_STATUS_FAILED);
+ migrate_set_error(s, local_err);
+ error_report_err(local_err);
migrate_fd_cleanup(s);
return;
}
@@ -3290,6 +3294,7 @@ void migrate_fd_connect(MigrationState *s, Error *error_in)
}
if (multifd_save_setup(&local_err) != 0) {
+ migrate_set_error(s, local_err);
error_report_err(local_err);
migrate_set_state(&s->state, MIGRATION_STATUS_SETUP,
MIGRATION_STATUS_FAILED);
--
2.40.1
next prev parent reply other threads:[~2023-07-24 13:10 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-24 13:06 [PATCH 00/26] Migration PULL 2023-07-24 Juan Quintela
2023-07-24 13:06 ` [PATCH 01/26] migration/multifd: Rename threadinfo.c functions Juan Quintela
2023-07-24 13:06 ` [PATCH 02/26] migration/multifd: Protect accesses to migration_threads Juan Quintela
2023-07-24 13:29 ` Fabiano Rosas
2023-07-24 13:06 ` [PATCH 03/26] softmmu/dirtylimit: Add parameter check for hmp "set_vcpu_dirty_limit" Juan Quintela
2023-07-24 13:06 ` [PATCH 04/26] qapi/migration: Introduce x-vcpu-dirty-limit-period parameter Juan Quintela
2023-07-24 13:06 ` [PATCH 05/26] qapi/migration: Introduce vcpu-dirty-limit parameters Juan Quintela
2023-07-24 13:06 ` [PATCH 06/26] migration: Introduce dirty-limit capability Juan Quintela
2023-07-24 13:06 ` [PATCH 07/26] migration: Refactor auto-converge capability logic Juan Quintela
2023-07-24 13:06 ` [PATCH 08/26] migration: Put the detection logic before auto-converge checking Juan Quintela
2023-07-24 13:06 ` [PATCH 09/26] migration: Implement dirty-limit convergence algo Juan Quintela
2023-07-24 13:06 ` [PATCH 10/26] migration: Extend query-migrate to provide dirty page limit info Juan Quintela
2023-07-24 13:06 ` [PATCH 11/26] migration-test: Be consistent for ppc Juan Quintela
2023-07-24 13:06 ` [PATCH 12/26] migration-test: Make machine_opts regular with other options Juan Quintela
2023-07-24 13:06 ` [PATCH 13/26] migration-test: Create arch_opts Juan Quintela
2023-07-24 13:06 ` [PATCH 14/26] migration-test: machine_opts is really arch specific Juan Quintela
2023-07-24 13:06 ` [PATCH 15/26] migration.json: Don't use space before colon Juan Quintela
2023-07-24 13:06 ` [PATCH 16/26] migration: skipped field is really obsolete Juan Quintela
2023-07-24 13:06 ` [PATCH 17/26] docs/migration: Update postcopy bits Juan Quintela
2023-07-24 13:06 ` Juan Quintela [this message]
2023-07-24 13:06 ` [PATCH 19/26] migration: enforce multifd and postcopy preempt to be set before incoming Juan Quintela
2023-07-24 13:06 ` [PATCH 20/26] qtest/migration-tests.c: use "-incoming defer" for postcopy tests Juan Quintela
2023-07-24 13:06 ` [PATCH 21/26] qemu-file: Rename qemu_file_transferred_ fast -> noflush Juan Quintela
2023-07-24 13:06 ` [PATCH 22/26] migration: Change qemu_file_transferred to noflush Juan Quintela
2023-07-24 13:06 ` [PATCH 23/26] qemu_file: Make qemu_file_is_writable() static Juan Quintela
2023-07-24 13:06 ` [PATCH 24/26] qemu-file: Simplify qemu_file_shutdown() Juan Quintela
2023-07-24 13:06 ` [PATCH 25/26] qemu-file: Make qemu_file_get_error_obj() static Juan Quintela
2023-07-24 13:06 ` [PATCH 26/26] migration/rdma: Split qemu_fopen_rdma() into input/output functions Juan Quintela
2023-07-24 13:28 ` [PATCH 00/26] Migration PULL 2023-07-24 Thomas Huth
2023-07-31 6:56 ` Juan Quintela
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230724130639.93135-19-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=armbru@redhat.com \
--cc=eblake@redhat.com \
--cc=leobras@redhat.com \
--cc=libvir-list@redhat.com \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=tejus.gk@nutanix.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).