From nobody Fri Oct 18 08:50:11 2024 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=linux.microsoft.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1720092173124402.2605774682361; Thu, 4 Jul 2024 04:22:53 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 1D1E0A6C; Thu, 4 Jul 2024 07:22:52 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id A41EF15E3; Thu, 4 Jul 2024 07:19:26 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id B771B1563; Thu, 4 Jul 2024 07:19:18 -0400 (EDT) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lists.libvirt.org (Postfix) with ESMTP id E093E98B for ; Thu, 4 Jul 2024 07:19:06 -0400 (EDT) Received: from paekkaladevi-dev-u22.gi4irqh5pfqublruu4yyku2wof.phxx.internal.cloudapp.net (unknown [20.125.125.171]) by linux.microsoft.com (Postfix) with ESMTPSA id 31B5220B7004; Thu, 4 Jul 2024 04:19:06 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 31B5220B7004 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1720091946; bh=I1K2eDul6QRcfWJiawKvduAivM47+wRQsPw7VQI6B2Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CVUm8Eadi2nMQ+45mL6+xZtkgwc3ReH6vLvywgSrpxXttmXM8LMXIOyc4Uc+0pSrq 1F0Qay4JWd+46a0W8mc/aRwmCVaSQT4h6i6sOxo4fcFmeL+jTndrrFB+nIGf2pU8VG FDwikJoLqTrnALRxHM6zkX260/mldEHv2uecr5YY= From: Purna Pavan Chandra To: devel@lists.libvirt.org Subject: [PATCH v2 8/8] ch: kill CH process if restore fails Date: Thu, 4 Jul 2024 11:19:02 +0000 Message-Id: <20240704111902.13237-9-paekkaladevi@linux.microsoft.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240704111902.13237-1-paekkaladevi@linux.microsoft.com> References: <20240704111902.13237-1-paekkaladevi@linux.microsoft.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: NXDVUZRLQZYXZNDET5AKN4PEXKSAPE7R X-Message-ID-Hash: NXDVUZRLQZYXZNDET5AKN4PEXKSAPE7R X-MailFrom: paekkaladevi@linux.microsoft.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 CC: kumarpraveen@linux.microsoft.com, paekkaladevi@microsoft.com, liuwe@microsoft.com, prapal@linux.microsoft.com, Purna Pavan Chandra 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 (Computed bodyhash is different from the expected one) X-ZM-MESSAGEID: 1720092174368100001 Content-Type: text/plain; charset="utf-8" Invoke virCHProcessStop to kill CH process incase of any failures during restore operation. Signed-off-by: Purna Pavan Chandra --- src/ch/ch_process.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ch/ch_process.c b/src/ch/ch_process.c index 540bf6801d..b77ab97a9f 100644 --- a/src/ch/ch_process.c +++ b/src/ch/ch_process.c @@ -980,7 +980,7 @@ virCHProcessStartRestore(virCHDriver *driver, virDomain= Obj *vm, const char *from if (!(priv->monitor =3D virCHProcessConnectMonitor(driver, vm))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to create connection to CH socket")); - return -1; + goto cleanup; } } =20 @@ -991,7 +991,7 @@ virCHProcessStartRestore(virCHDriver *driver, virDomain= Obj *vm, const char *from if (virCHMonitorBuildRestoreJson(vm->def, from, &payload) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to restore domain")); - return -1; + goto cleanup; } =20 virBufferAddLit(&http_headers, "PUT /api/v1/vm.restore HTTP/1.1\r\n"); @@ -1004,7 +1004,7 @@ virCHProcessStartRestore(virCHDriver *driver, virDoma= inObj *vm, const char *from payload =3D virBufferContentAndReset(&buf); =20 if ((mon_sockfd =3D chMonitorSocketConnect(priv->monitor)) < 0) - return -1; + goto cleanup; =20 if (virCHRestoreCreateNetworkDevices(driver, vm->def, &tapfds, &ntapfd= s, &nicindexes, &nnicindexes) < 0) goto cleanup; @@ -1041,5 +1041,7 @@ virCHProcessStartRestore(virCHDriver *driver, virDoma= inObj *vm, const char *from cleanup: if (tapfds) chCloseFDs(tapfds, ntapfds); + if (ret) + virCHProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED); return ret; } --=20 2.34.1