From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1567DC4345F for ; Thu, 18 Apr 2024 14:38:18 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rxStB-00050i-4S; Thu, 18 Apr 2024 10:37:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rxSt9-00050Y-Ng for qemu-devel@nongnu.org; Thu, 18 Apr 2024 10:37:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rxSt7-0003w0-Ko for qemu-devel@nongnu.org; Thu, 18 Apr 2024 10:37:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1713451040; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=VnSMWbK9DeK22WngUTCoLZXhTnibhJJYyTsvCJDzMcg=; b=caWvf1IJtfUxQyXN74lV+qkp3dmPpZgobrG6d0eMSbptkmnXURo+4QgJXmuQxfSHBfaKCk GKSIxjmM4vxcETvtaJBRCK+NflOEHuesmFHk7CgA9kKf93aKaU/9LpHziG8nFhOtE2Bdk2 rk1lBaTgW97tYEhDb11ExyNY4ZFpnho= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-635-6kwzdfiuP_aZlmQAfp4OvA-1; Thu, 18 Apr 2024 10:37:17 -0400 X-MC-Unique: 6kwzdfiuP_aZlmQAfp4OvA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D55F31049883; Thu, 18 Apr 2024 14:37:16 +0000 (UTC) Received: from redhat.com (unknown [10.42.28.72]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 400A149103; Thu, 18 Apr 2024 14:37:14 +0000 (UTC) Date: Thu, 18 Apr 2024 15:37:11 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Vladimir Sementsov-Ogievskiy Cc: peterx@redhat.com, farosas@suse.de, yc-core@yandex-team.ru, thuth@redhat.com, lvivier@redhat.com, pbonzini@redhat.com, qemu-devel@nongnu.org, pkrempa@redhat.com Subject: Re: [PATCH] migration: do not exit on incoming failure Message-ID: References: <20240417221329.248803-1-vsementsov@yandex-team.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20240417221329.248803-1-vsementsov@yandex-team.ru> User-Agent: Mutt/2.2.12 (2023-09-09) X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.067, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Thu, Apr 18, 2024 at 01:13:29AM +0300, Vladimir Sementsov-Ogievskiy wrote: > We do set MIGRATION_FAILED state, but don't give a chance to > orchestrator to query migration state and get the error. > > Let's report an error through QAPI like we do on outgoing migration. > > migration-test is updated correspondingly. > > Signed-off-by: Vladimir Sementsov-Ogievskiy > --- > > Doubt: is exiting on failure a contract? Will this commit break > something in Libvirt? Finally, could we just change the logic, or I need > and additional migration-parameter for new behavior? There's a decent risk that this could break apps, whether libvirt or something else, especially if the app is just launching QEMU with '-incoming URI', rather than using '-incoming defer' and then explicitly using QMP to start the incoming migration. I'd say that with '-incoming defer' we should *not* exit on migration error, because that arg implies the app explicitly wants to be using QMP to control migration. With the legacy '-incoming URI' it is probably best to keep exit on error, as that's comparatively more likely to be used in adhoc scenarios where the app/user is ignoring QMP on the dst side. None the less, I think we need to check how libvirt behaves with this patch to be sure of no surprises. > > migration/migration.c | 22 +++++++--------------- > tests/qtest/migration-helpers.c | 13 ++++++++++--- > tests/qtest/migration-helpers.h | 3 ++- > tests/qtest/migration-test.c | 14 +++++++------- > 4 files changed, 26 insertions(+), 26 deletions(-) > > diff --git a/migration/migration.c b/migration/migration.c > index 86bf76e925..3c203e767d 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -738,11 +738,12 @@ process_incoming_migration_co(void *opaque) > MigrationIncomingState *mis = migration_incoming_get_current(); > PostcopyState ps; > int ret; > + Error *local_err = NULL; > > assert(mis->from_src_file); > > if (compress_threads_load_setup(mis->from_src_file)) { > - error_report("Failed to setup decompress threads"); > + error_setg(&local_err, "Failed to setup decompress threads"); > goto fail; > } > > @@ -779,32 +780,23 @@ process_incoming_migration_co(void *opaque) > } > > if (ret < 0) { > - MigrationState *s = migrate_get_current(); > - > - if (migrate_has_error(s)) { > - WITH_QEMU_LOCK_GUARD(&s->error_mutex) { > - error_report_err(s->error); > - } > - } > - error_report("load of migration failed: %s", strerror(-ret)); > + error_setg(&local_err, "load of migration failed: %s", strerror(-ret)); > goto fail; > } > > if (colo_incoming_co() < 0) { > + error_setg(&local_err, "colo incoming failed"); > goto fail; > } > > migration_bh_schedule(process_incoming_migration_bh, mis); > return; > fail: > + migrate_set_error(migrate_get_current(), local_err); > + error_report_err(local_err); > migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE, > MIGRATION_STATUS_FAILED); > - qemu_fclose(mis->from_src_file); > - > - multifd_recv_cleanup(); > - compress_threads_load_cleanup(); > - > - exit(EXIT_FAILURE); > + migration_incoming_state_destroy(); > } > > /** > diff --git a/tests/qtest/migration-helpers.c b/tests/qtest/migration-helpers.c > index e451dbdbed..91c13bd566 100644 > --- a/tests/qtest/migration-helpers.c > +++ b/tests/qtest/migration-helpers.c > @@ -211,7 +211,8 @@ void wait_for_migration_complete(QTestState *who) > wait_for_migration_status(who, "completed", NULL); > } > > -void wait_for_migration_fail(QTestState *from, bool allow_active) > +void wait_for_migration_fail(QTestState *from, bool allow_active, > + bool is_incoming) > { > g_test_timer_start(); > QDict *rsp_return; > @@ -236,8 +237,14 @@ void wait_for_migration_fail(QTestState *from, bool allow_active) > /* Is the machine currently running? */ > rsp_return = qtest_qmp_assert_success_ref(from, > "{ 'execute': 'query-status' }"); > - g_assert(qdict_haskey(rsp_return, "running")); > - g_assert(qdict_get_bool(rsp_return, "running")); > + if (is_incoming) { > + if (qdict_haskey(rsp_return, "running")) { > + g_assert(!qdict_get_bool(rsp_return, "running")); > + } > + } else { > + g_assert(qdict_haskey(rsp_return, "running")); > + g_assert(qdict_get_bool(rsp_return, "running")); > + } > qobject_unref(rsp_return); > } > > diff --git a/tests/qtest/migration-helpers.h b/tests/qtest/migration-helpers.h > index 3bf7ded1b9..7bd07059ae 100644 > --- a/tests/qtest/migration-helpers.h > +++ b/tests/qtest/migration-helpers.h > @@ -46,7 +46,8 @@ void wait_for_migration_status(QTestState *who, > > void wait_for_migration_complete(QTestState *who); > > -void wait_for_migration_fail(QTestState *from, bool allow_active); > +void wait_for_migration_fail(QTestState *from, bool allow_active, > + bool is_incoming); > > char *find_common_machine_version(const char *mtype, const char *var1, > const char *var2); > diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c > index 1d2cee87ea..e00b755f05 100644 > --- a/tests/qtest/migration-test.c > +++ b/tests/qtest/migration-test.c > @@ -1670,7 +1670,7 @@ static void test_baddest(void) > return; > } > migrate_qmp(from, "tcp:127.0.0.1:0", "{}"); > - wait_for_migration_fail(from, false); > + wait_for_migration_fail(from, false, false); > test_migrate_end(from, to, false); > } > > @@ -1781,10 +1781,10 @@ static void test_precopy_common(MigrateCommon *args) > > if (args->result != MIG_TEST_SUCCEED) { > bool allow_active = args->result == MIG_TEST_FAIL; > - wait_for_migration_fail(from, allow_active); > + wait_for_migration_fail(from, allow_active, false); > > if (args->result == MIG_TEST_FAIL_DEST_QUIT_ERR) { > - qtest_set_expected_status(to, EXIT_FAILURE); > + wait_for_migration_fail(to, true, true); > } > } else { > if (args->live) { > @@ -2571,8 +2571,8 @@ static void do_test_validate_uuid(MigrateStart *args, bool should_fail) > migrate_qmp(from, uri, "{}"); > > if (should_fail) { > - qtest_set_expected_status(to, EXIT_FAILURE); > - wait_for_migration_fail(from, true); > + wait_for_migration_fail(to, true, true); > + wait_for_migration_fail(from, true, false); > } else { > wait_for_migration_complete(from); > } > @@ -3047,8 +3047,8 @@ static void test_multifd_tcp_cancel(void) > migrate_cancel(from); > > /* Make sure QEMU process "to" exited */ > - qtest_set_expected_status(to, EXIT_FAILURE); > - qtest_wait_qemu(to); > + wait_for_migration_fail(to, true, true); > + qtest_quit(to); > > args = (MigrateStart){ > .only_target = true, > -- > 2.34.1 > > With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|