From nobody Tue Jan 21 04:09:17 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1736955641416703.9862811237485; Wed, 15 Jan 2025 07:40:41 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id DAD001A1F; Wed, 15 Jan 2025 10:40:40 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 6D6571A31; Wed, 15 Jan 2025 10:40:10 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id BB5D31987; Wed, 15 Jan 2025 10:40:05 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 3E9711956 for ; Wed, 15 Jan 2025 10:40:05 -0500 (EST) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-648-tInyEdpWOH2u9QHfayCONQ-1; Wed, 15 Jan 2025 10:40:03 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B12C4195418F for ; Wed, 15 Jan 2025 15:40:02 +0000 (UTC) Received: from orkuz (unknown [10.45.225.12]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1BD0F1955BE3 for ; Wed, 15 Jan 2025 15:40:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-2.3 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736955605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=po3SwhwsatuBZ0CoSRX8o+1lusLZApq6ECUI/GT4jCM=; b=Fl0F2ZFMItNy23XYZOx3/OXBfRXWzJlcDzjfbRrt8QplPikn931nfstgBqBJd35PHff1XP 2CC8UA14TddFETROamVd75MrCXW1XX3GgiE1n6uu+zpIEib1L1c56kaKXdWhGYOPNF+q7e 6NTaRppWDFBmN3ZFO/hkq3IZeTSCfeI= X-MC-Unique: tInyEdpWOH2u9QHfayCONQ-1 X-Mimecast-MFC-AGG-ID: tInyEdpWOH2u9QHfayCONQ From: Jiri Denemark To: devel@lists.libvirt.org Subject: [PATCH 1/2] qemu_migration: Refactor qemuMigrationSrcRestoreDomainState Date: Wed, 15 Jan 2025 16:39:54 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: FnKmQqBXGb8QQNC4d01Z8ry7a4o9gP4Y1s2-uIFbx00_1736955602 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: VWTUII7G4DC7W6YNMHFTPIC45TS2ZF25 X-Message-ID-Hash: VWTUII7G4DC7W6YNMHFTPIC45TS2ZF25 X-MailFrom: jdenemar@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1736955642998019000 Content-Type: text/plain; charset="utf-8" None of the callers really care about the return value so we can drop it and simplify the code a bit. Signed-off-by: Jiri Denemark Reviewed-by: Michal Privoznik --- Notes: Best viewed with -w src/qemu/qemu_migration.c | 64 +++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 36 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 8c0e522828..71aaa9799c 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -219,57 +219,49 @@ qemuMigrationSrcStoreDomainState(virDomainObj *vm) priv->preMigrationState, vm); } =20 -/* Returns true if the domain was resumed, false otherwise */ -static bool + +static void qemuMigrationSrcRestoreDomainState(virQEMUDriver *driver, virDomainObj *vm) { qemuDomainObjPrivate *priv =3D vm->privateData; + virDomainState preMigrationState =3D priv->preMigrationState; int reason; virDomainState state =3D virDomainObjGetState(vm, &reason); - bool ret =3D false; + + priv->preMigrationState =3D VIR_DOMAIN_NOSTATE; =20 VIR_DEBUG("driver=3D%p, vm=3D%p, pre-mig-state=3D%s, state=3D%s, reaso= n=3D%s", driver, vm, - virDomainStateTypeToString(priv->preMigrationState), + virDomainStateTypeToString(preMigrationState), virDomainStateTypeToString(state), virDomainStateReasonToString(state, reason)); =20 - if (state !=3D VIR_DOMAIN_PAUSED || + if (preMigrationState !=3D VIR_DOMAIN_RUNNING || + state !=3D VIR_DOMAIN_PAUSED || reason =3D=3D VIR_DOMAIN_PAUSED_POSTCOPY_FAILED) - goto cleanup; + return; =20 - if (priv->preMigrationState =3D=3D VIR_DOMAIN_RUNNING) { - /* This is basically the only restore possibility that's safe - * and we should attempt to do */ - - VIR_DEBUG("Restoring pre-migration state due to migration error"); - - /* we got here through some sort of failure; start the domain agai= n */ - if (qemuProcessStartCPUs(driver, vm, - VIR_DOMAIN_RUNNING_MIGRATION_CANCELED, - VIR_ASYNC_JOB_MIGRATION_OUT) < 0) { - /* Hm, we already know we are in error here. We don't want to - * overwrite the previous error, though, so we just throw some= thing - * to the logs and hope for the best */ - VIR_ERROR(_("Failed to resume guest %1$s after failure"), vm->= def->name); - if (virDomainObjGetState(vm, NULL) =3D=3D VIR_DOMAIN_PAUSED) { - virObjectEvent *event; - - virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, - VIR_DOMAIN_PAUSED_API_ERROR); - event =3D virDomainEventLifecycleNewFromObj(vm, - VIR_DOMAIN_EVENT= _SUSPENDED, - VIR_DOMAIN_EVENT= _SUSPENDED_API_ERROR); - virObjectEventStateQueue(driver->domainEventState, event); - } - goto cleanup; + VIR_DEBUG("Restoring pre-migration state due to migration error"); + + /* we got here through some sort of failure; start the domain again */ + if (qemuProcessStartCPUs(driver, vm, + VIR_DOMAIN_RUNNING_MIGRATION_CANCELED, + VIR_ASYNC_JOB_MIGRATION_OUT) < 0) { + /* Hm, we already know we are in error here. We don't want to + * overwrite the previous error, though, so we just throw something + * to the logs and hope for the best */ + VIR_ERROR(_("Failed to resume guest %1$s after failure"), vm->def-= >name); + if (virDomainObjGetState(vm, NULL) =3D=3D VIR_DOMAIN_PAUSED) { + virObjectEvent *event; + + virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, + VIR_DOMAIN_PAUSED_API_ERROR); + event =3D virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_SUS= PENDED, + VIR_DOMAIN_EVENT_SUS= PENDED_API_ERROR); + virObjectEventStateQueue(driver->domainEventState, event); } - ret =3D true; } - - cleanup: - priv->preMigrationState =3D VIR_DOMAIN_NOSTATE; - return ret; } =20 =20 --=20 2.47.1 From nobody Tue Jan 21 04:09:17 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1736955657579198.08656669574805; Wed, 15 Jan 2025 07:40:57 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 081FD19B3; Wed, 15 Jan 2025 10:40:56 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 091971A18; Wed, 15 Jan 2025 10:40:18 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 8DCE719F0; Wed, 15 Jan 2025 10:40:14 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id A99CE1A18 for ; Wed, 15 Jan 2025 10:40:07 -0500 (EST) Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-14-K4L6jOKeP5OV3SL5uWGNQQ-1; Wed, 15 Jan 2025 10:40:05 -0500 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1AEB91955D5C for ; Wed, 15 Jan 2025 15:40:05 +0000 (UTC) Received: from orkuz (unknown [10.45.225.12]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8323E19560AD for ; Wed, 15 Jan 2025 15:40:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-2.3 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736955607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dnVBe8s2CxFFT584gaP26/wxt6mZq1hna9rgjjWoHRY=; b=h2i7UgKWJOQYtOssXDNpVqkRRucCZEJ18aEY0aEgq5qX1EqAGCOzHP0lqXOsxpew5vSmQu wW17mgXSo4SL0AyZkmySSBgO9thrP8s6o7OwzYImGXrfFTYhEtdf08u+PrrQc/54rgNxq+ 9xa1AE/cwOdUUlFyZozYyAgDy7tpQIw= X-MC-Unique: K4L6jOKeP5OV3SL5uWGNQQ-1 X-Mimecast-MFC-AGG-ID: K4L6jOKeP5OV3SL5uWGNQQ From: Jiri Denemark To: devel@lists.libvirt.org Subject: [PATCH 2/2] qemu_migration: Do not automatically resume domain after I/O error Date: Wed, 15 Jan 2025 16:39:55 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: fSRHYy4UcDdL9USfzUen2BedXwjdbB3k9XnATD40AZM_1736955605 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 32OST6RI3T3YGRDDWN4WVLLQRE3GTVPF X-Message-ID-Hash: 32OST6RI3T3YGRDDWN4WVLLQRE3GTVPF X-MailFrom: jdenemar@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1736955658785019000 Content-Type: text/plain; charset="utf-8" When an I/O error happens (causing a domain to be paused) during live migration which is later cancelled by a user, trying to resume the domain doesn't make sense. Signed-off-by: Jiri Denemark Reviewed-by: Michal Privoznik --- src/qemu/qemu_migration.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 71aaa9799c..bb4d11e196 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -241,6 +241,11 @@ qemuMigrationSrcRestoreDomainState(virQEMUDriver *driv= er, virDomainObj *vm) reason =3D=3D VIR_DOMAIN_PAUSED_POSTCOPY_FAILED) return; =20 + if (reason =3D=3D VIR_DOMAIN_PAUSED_IOERROR) { + VIR_DEBUG("Domain is paused due to I/O error, skipping resume"); + return; + } + VIR_DEBUG("Restoring pre-migration state due to migration error"); =20 /* we got here through some sort of failure; start the domain again */ --=20 2.47.1