From: Oguz Bektas <o.bektas@proxmox.com>
To: Fabian Ebner <f.ebner@proxmox.com>
Cc: pve-devel@lists.proxmox.com
Subject: Re: [pve-devel] [PATCH qemu-server] apply pending changes at vm stop only if the section is not empty
Date: Wed, 1 Dec 2021 16:10:37 +0100 [thread overview]
Message-ID: <YaeQbTcQ9CNpKj0W@gaia> (raw)
In-Reply-To: <6b75b431-83f1-8010-4c93-fa74c1b73b6f@proxmox.com>
On Wed, Dec 01, 2021 at 03:10:28PM +0100, Fabian Ebner wrote:
> Am 01.12.21 um 13:00 schrieb Oguz Bektas:
> > we also have the same skipping logic when starting vms. this way we
> > avoid calling 'write_config' when there are no present changes to
> > commit.
> >
> > Signed-off-by: Oguz Bektas <o.bektas@proxmox.com>
> > ---
> > PVE/QemuServer.pm | 6 ++++--
> > 1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
> > index 45b704d..1379f33 100644
> > --- a/PVE/QemuServer.pm
> > +++ b/PVE/QemuServer.pm
> > @@ -4998,6 +4998,8 @@ sub vmconfig_delete_or_detach_drive {
> > sub vmconfig_apply_pending {
> > my ($vmid, $conf, $storecfg, $errors) = @_;
> > + return if !scalar(keys %{$conf->{pending}});
>
> Isn't this part of the patch enough? For the caller while starting a VM you
> mentioned, there is an additional load_config() that is skipped if there are
> no pending changes, but for the two callers below, there is no such benefit.
> They just indicate that any pending changes should be applied, which is fine
> even if there are none.
yes i guess it's alright to keep this part only :) though we could still
avoid the vmconfig_apply_pending call in vm_stop_cleanup completely if
the section is empty anyway. not that it brings much but still it
should be fine..
>
> > +
> > my $add_apply_error = sub {
> > my ($opt, $msg) = @_;
> > my $err_msg = "unable to apply pending change $opt : $msg";
> > @@ -5889,7 +5891,7 @@ sub _do_vm_stop {
> > die "VM quit/powerdown failed - got timeout\n";
> > }
> > } else {
> > - vm_stop_cleanup($storecfg, $vmid, $conf, $keepActive, 1) if $conf;
> > + vm_stop_cleanup($storecfg, $vmid, $conf, $keepActive, scalar(keys %{$conf->{pending}})) if $conf;
>
> Style nit: >100 characters
>
> > return;
> > }
> > } else {
> > @@ -5920,7 +5922,7 @@ sub _do_vm_stop {
> > sleep 1;
> > }
> > - vm_stop_cleanup($storecfg, $vmid, $conf, $keepActive, 1) if $conf;
> > + vm_stop_cleanup($storecfg, $vmid, $conf, $keepActive, scalar(keys %{$conf->{pending}})) if $conf;
> > }
> > # Note: use $nocheck to skip tests if VM configuration file exists.
> >
prev parent reply other threads:[~2021-12-01 15:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-01 12:00 Oguz Bektas
2021-12-01 14:10 ` Fabian Ebner
2021-12-01 15:10 ` Oguz Bektas [this message]
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=YaeQbTcQ9CNpKj0W@gaia \
--to=o.bektas@proxmox.com \
--cc=f.ebner@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