From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Subject: Re: [pve-devel] [PATCH qemu-server 1/1] Do not start VM twice when rollbacking with --start
Date: Mon, 21 Nov 2022 13:44:24 +0100 [thread overview]
Message-ID: <1669034564.kkh92yecnq.astroid@yuna.none> (raw)
In-Reply-To: <20221121122938.249764-1-s.hanreich@proxmox.com>
On November 21, 2022 1:29 pm, Stefan Hanreich wrote:
> When rollbacking to the snapshot of a VM that includes RAM, the VM
> gets started by the rollback task anyway, so no additional start task is
> needed. Previously, when running rollback with the --start parameter
> and the VM snapshot includes RAM, a start task was created. That task
> failed because the VM had already been started by the rollback task.
>
> Additionally documented this behaviour in the description of the --start
> parameter
>
> Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
> ---
> PVE/API2/Qemu.pm | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
> index 6bdcce2..7263a1a 100644
> --- a/PVE/API2/Qemu.pm
> +++ b/PVE/API2/Qemu.pm
> @@ -5064,7 +5064,8 @@ __PACKAGE__->register_method({
> snapname => get_standard_option('pve-snapshot-name'),
> start => {
> type => 'boolean',
> - description => "Whether the VM should get started after rolling back successfully",
> + description => "Whether the VM should get started after rolling back successfully."
> + . " A VM will always be started when rollbacking a snapshot with RAM included, regardless of this parameter.",
> optional => 1,
> default => 0,
> },
> @@ -5092,7 +5093,13 @@ __PACKAGE__->register_method({
> PVE::QemuConfig->snapshot_rollback($vmid, $snapname);
>
> if ($param->{start}) {
> - PVE::API2::Qemu->vm_start({ vmid => $vmid, node => $node });
> + my $conf = PVE::QemuConfig->load_config($vmid);
> + my $snap = $conf->{snapshots}->{$snapname};
> + die "snapshot '$snapname' does not exist\n" if !defined($snap);
> +
> + if (!$snap->{vmstate}) {
> + PVE::API2::Qemu->vm_start({ vmid => $vmid, node => $node });
> + }
this could also just call check_running, and skip the start call if it returns
true.
if ($param_start && !check_running(..)) {
..
}
> }
> };
>
> --
> 2.30.2
>
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>
>
>
next prev parent reply other threads:[~2022-11-21 12:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-21 12:29 Stefan Hanreich
2022-11-21 12:44 ` Fabian Grünbichler [this message]
2022-11-21 12:57 ` Stefan Hanreich
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=1669034564.kkh92yecnq.astroid@yuna.none \
--to=f.gruenbichler@proxmox.com \
--cc=pve-devel@lists.proxmox.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