From nobody Wed Mar 12 17:59: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=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1741215551; cv=none; d=zohomail.com; s=zohoarc; b=NVpHudx4Gq3AW2gvlcaCGDUAdRZaskijo2ecOR6UKCGczvsbesftS1SIDkIlTgvJCKwnKysFKiC4kQ2aHTCEJED23xgaga8K8igiFEmc9tOySi3HV+pBIHJo6hiHEeSJLO7vCEQerrI60uaD1gVrQs4L0PGyMIkxNzMI96k9PvE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741215551; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=MAAXy99+U21it50PASUDCbH88MyzGF5TsR/ZjnxRUYU=; b=eMMtVgDdPu2Hp2PCA+kpxrojJH+flZEO1vITAzsm1DKut/JSzv6rjTxzX6vImILt0BRATbeSQr4aRYrST7w27Lr3hLDfEB7ltQ17nLqtenilxPhqScYpuvuqvVIQFeOBJy7J22PN3nQ7E1gtniz3LqMpLs9XEk5zjdA7wSWUikw= ARC-Authentication-Results: i=1; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1741215551371567.5822765723635; Wed, 5 Mar 2025 14:59:11 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id CE529B25; Wed, 5 Mar 2025 17:59:10 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id C7BC117A9; Wed, 5 Mar 2025 17:51:05 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 57F7414EA; Wed, 5 Mar 2025 17:50:55 -0500 (EST) Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) (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 5D6571706 for ; Wed, 5 Mar 2025 17:50:33 -0500 (EST) Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-5e0b70fb1daso12988347a12.1 for ; Wed, 05 Mar 2025 14:50:33 -0800 (PST) Received: from localhost (205-201-32-8.scinternet.net. [205.201.32.8]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-223501f9e46sm118607575ad.53.2025.03.05.14.50.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Mar 2025 14:50:31 -0800 (PST) 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, 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=suse.com; s=google; t=1741215032; x=1741819832; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ffylRG6SOT94eHgEY8mCpl3hMeLcaxD6CkO5GYNRJrE=; b=cFXkGenAlNkAHC5ak78XiD8gniXlDSlLVdv09AUapBPeJE1t1beqyWo46vI3AmKW83 OpWXoRsSAeslDJ1dHNCj8vWKAFwFGtFFFhMg830LurZjafOlP0ty0cJLfBq0T8CyTVfN tUbxdCHLiv5re1FpzT22HRb69l2KkdKa6y0gg6RvMo/HN/PdPYUhJ12Htn1Pu1p/IsjP k53A/i4RKAJwTrzWVcCg3iOoX96QgHwoj+iYNpUUvkz3HWPKWAwxP4veLF1FD3oANrbo 9z068roxsCSTWFdmHoDTgnGosYXsnhoLtjIuKE0NEApukVASDHnHpkogbz4/guM41fZv Ztjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741215032; x=1741819832; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ffylRG6SOT94eHgEY8mCpl3hMeLcaxD6CkO5GYNRJrE=; b=JqrLhmrNM0y+wKGuD/ZtD+1bLp99IwM3J8HdObg0vjdOuywCI8tPFKauN23kVwDOyE 7IkC5UpKqOCEJPMpcJmUwA6WUh55SwU4iiBQQ3vLgdgLc2hB4i9XRWB+IQInUXTHF7kn ZGNrMWbAs+V0NMO7pqlSerWSAp0qZ8T/tdNBN31SWegOa9HSkxLLroZFTrAxGyftj7es HUo2tBI+SBId1nAVtFwUjyize51tJGKMogqsxr+gC/xYykSS2eCHDgeMJPnxagKjQeDL rX2YYrfUFTtlABPwYm7jAEwMQnZy7vre241erqqHJiaY+KP+byqMv8JtkjyBLmIMrWDW HdMg== X-Gm-Message-State: AOJu0YxDtpjD4P5tD0mUMme+KXDFa0B7ryFHLqH4F7WmruWbUYks1Buw kP1FoKJU5aUGWtkjHzDlPlkaWvslXR+pUyMsYEn43yiVuKjoFJYpxfoCiXYIyENqVAnB8mP6+1s n X-Gm-Gg: ASbGncuEveTFkQALhqIHNw9D1Da3vSsbZmOD6l0nDjFaQ0wpDtlVaURegAPQLQ9f+PB 4qwZYypwLKt0bwQ1DHlxNv0wshWDkbUy8EYKt/OhWBqK2Hviw0dtgJvyuMLjZ0U8kwtWaOp1hdp +3+lP0gtYB7c+Na9CSPY/HMNLfxvxjlT20J+zP2jpeF7KI5UWtvSMMp9UDaCEG8EPgNL6SAII8o O3PeyDsagmjtDTWQrTvYfn6KnQn/m8JH9RGlWX8FJ9FO7tEW8z+EqNT2CyrqmzLmIYY8K3vjrP3 /3Pbn8+8gag0LKgoEAxHSAnhgvlWTXvoIja8xqRgMKpr/lGFWqsv3LiZSamSFCk= X-Google-Smtp-Source: AGHT+IGSC2W8GPsEtS0zEqYPmxTw8JzicxtOjVEkaS0b/hryy7bwsd2fCiDmsZhtAOj/RpG86nyh+A== X-Received: by 2002:a05:6402:1e8c:b0:5d9:fc81:e197 with SMTP id 4fb4d7f45d1cf-5e59f3c2304mr4209402a12.8.1741215032101; Wed, 05 Mar 2025 14:50:32 -0800 (PST) To: devel@lists.libvirt.org Subject: [PATCH V4 18/18] tools: add parallel parameter to virsh restore command Date: Wed, 5 Mar 2025 15:48:27 -0700 Message-ID: <20250305224957.5369-19-jfehlig@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250305224957.5369-1-jfehlig@suse.com> References: <20250305224957.5369-1-jfehlig@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: KQE2FHIRYXWE3NIZP6CHFOFCTFUIE37V X-Message-ID-Hash: KQE2FHIRYXWE3NIZP6CHFOFCTFUIE37V X-MailFrom: jfehlig@suse.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: farosas@suse.de, Claudio Fontana 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: From: Jim Fehlig via Devel Reply-To: Jim Fehlig X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741215552271019000 Content-Type: text/plain; charset="utf-8" From: Claudio Fontana Signed-off-by: Claudio Fontana Signed-off-by: Jim Fehlig --- docs/manpages/virsh.rst | 9 +++++++-- tools/virsh-domain.c | 39 +++++++++++++++++++++++++++++++++++---- 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index 5d4a77bdf4..40a13993ed 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -3966,12 +3966,13 @@ restore :: =20 restore state-file [--bypass-cache] [--xml file] - [{--running | --paused}] [--reset-nvram] + [{--running | --paused}] [--reset-nvram] [--parallel] [--parallel-ch= annels] =20 Restores a domain from a ``virsh save`` state file. See *save* for more in= fo. =20 If *--bypass-cache* is specified, the restore will avoid the file system -cache, although this may slow down the operation. +cache. Depending on the specific scenario this may slow down or speed up +the operation. =20 *--xml* ``file`` is usually omitted, but can be used to supply an alternative XML file for use on the restored guest with changes only @@ -3987,6 +3988,10 @@ domain should be started in. If *--reset-nvram* is specified, any existing NVRAM file will be deleted and re-initialized from its pristine template. =20 +*--parallel* option will cause the save data to be loaded using the number +of parallel IO channels specified with *--parallel-channels*. Parallel +channels will help speed up large restore operations. + ``Note``: To avoid corrupting file system contents within the domain, you should not reuse the saved state file for a second ``restore`` unless you have also reverted all storage volumes back to the same contents as when diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 797df48d9d..acc3064983 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -5281,6 +5281,14 @@ static const vshCmdOptDef opts_restore[] =3D { .type =3D VSH_OT_BOOL, .help =3D N_("avoid file system cache when restoring") }, + {.name =3D "parallel", + .type =3D VSH_OT_BOOL, + .help =3D N_("enable parallel restore") + }, + {.name =3D "parallel-channels", + .type =3D VSH_OT_INT, + .help =3D N_("number of IO channels to use for parallel restore") + }, {.name =3D "xml", .type =3D VSH_OT_STRING, .unwanted_positional =3D true, @@ -5310,13 +5318,16 @@ cmdRestore(vshControl *ctl, const vshCmd *cmd) const char *xmlfile =3D NULL; g_autofree char *xml =3D NULL; virshControl *priv =3D ctl->privData; + virTypedParameterPtr params =3D NULL; + int nparams =3D 0; + int maxparams =3D 0; + int nchannels =3D 1; int rc; =20 - if (vshCommandOptString(ctl, cmd, "file", &from) < 0) - return false; - if (vshCommandOptBool(cmd, "bypass-cache")) flags |=3D VIR_DOMAIN_SAVE_BYPASS_CACHE; + if (vshCommandOptBool(cmd, "parallel")) + flags |=3D VIR_DOMAIN_SAVE_PARALLEL; if (vshCommandOptBool(cmd, "running")) flags |=3D VIR_DOMAIN_SAVE_RUNNING; if (vshCommandOptBool(cmd, "paused")) @@ -5324,15 +5335,35 @@ cmdRestore(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "reset-nvram")) flags |=3D VIR_DOMAIN_SAVE_RESET_NVRAM; =20 + if (vshCommandOptString(ctl, cmd, "file", &from) < 0) + return false; + if (from && + virTypedParamsAddString(¶ms, &nparams, &maxparams, + VIR_DOMAIN_SAVE_PARAM_FILE, from) < 0) + return false; + if (vshCommandOptString(ctl, cmd, "xml", &xmlfile) < 0) return false; =20 if (xmlfile && virFileReadAll(xmlfile, VSH_MAX_XML_FILE, &xml) < 0) return false; + if (xml && + virTypedParamsAddString(¶ms, &nparams, &maxparams, + VIR_DOMAIN_SAVE_PARAM_DXML, xml) < 0) + return false; + + if (flags & VIR_DOMAIN_SAVE_PARALLEL) { + if ((rc =3D vshCommandOptInt(ctl, cmd, "parallel-channels", &nchan= nels)) < 0) + return false; + + if (virTypedParamsAddInt(¶ms, &nparams, &maxparams, + VIR_DOMAIN_SAVE_PARAM_PARALLEL_CHANNELS, = nchannels) < 0) + return false; + } =20 if (flags || xml) { - rc =3D virDomainRestoreFlags(priv->conn, from, xml, flags); + rc =3D virDomainRestoreParams(priv->conn, params, nparams, flags); } else { rc =3D virDomainRestore(priv->conn, from); } --=20 2.43.0