public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [POC qemu-server 5/6] add timing for testing
Date: Thu,  8 Apr 2021 12:33:15 +0200	[thread overview]
Message-ID: <20210408103316.7619-6-f.ebner@proxmox.com> (raw)
In-Reply-To: <20210408103316.7619-1-f.ebner@proxmox.com>

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
 PVE/QemuServer.pm | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index fa2aad9..0287a80 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -22,7 +22,7 @@ use JSON;
 use MIME::Base64;
 use POSIX;
 use Storable qw(dclone);
-use Time::HiRes qw(gettimeofday);
+use Time::HiRes qw(gettimeofday tv_interval);
 use URI::Escape;
 use UUID;
 
@@ -7743,16 +7743,34 @@ sub upgrade_qemu {
     my $ramfs = "/run/pve/${vmid}_ramfs";
     my $statefile = "${ramfs}/state";
 
+    # for testing
+    my $start;
+
+    my $print_elapsed = sub {
+	my ($what) = @_;
+	my $end = [gettimeofday()];
+	my $elapsed = tv_interval($start, $end);
+	print "elapsed: '$elapsed' for $what\n";
+	$start = [gettimeofday()];
+    };
+
+    $start = [gettimeofday()];
+
     mkpath($ramfs);
 
     run_command(['mount', '-t', 'ramfs', 'ramfs', $ramfs]);
     run_command(['truncate', '-s', "${size}M", $statefile]);
 
+    $print_elapsed->("preparing ramfs");
+
     eval {
 	eval {
 	    set_migration_caps($vmid, 1); #TODO needed here?
+	    $print_elapsed->("setting migration caps");
 	    mon_cmd($vmid, "savevm-start", statefile => $statefile);
+	    $print_elapsed->("issuing savevm-start");
 	    savevm_monitor($vmid);
+	    $print_elapsed->("saving state");
 	};
 	if (my $err = $@) {
 	    eval { mon_cmd($vmid, "savevm-end"); };
@@ -7761,6 +7779,7 @@ sub upgrade_qemu {
 	}
 
 	mon_cmd($vmid, "quit");
+	$print_elapsed->("issuing quit");
 
 	my $start_params = {
 	    statefile => $statefile,
@@ -7769,6 +7788,7 @@ sub upgrade_qemu {
 
 	# TODO forcecpu, spice ticket?
 	vm_start_nolock($storecfg, $vmid, $conf, $start_params, {});
+	$print_elapsed->("starting vm");
 
 	# TODO save state to disk if there's an error with start?
     };
-- 
2.20.1





  parent reply	other threads:[~2021-04-08 10:33 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-08 10:33 [pve-devel] [POC qemu-server] fix 3303: allow "live" upgrade of qemu version Fabian Ebner
2021-04-08 10:33 ` [pve-devel] [POC qemu-server 1/6] create vmstate_size helper Fabian Ebner
2021-04-08 10:33 ` [pve-devel] [POC qemu-server 2/6] create savevm_monitor helper Fabian Ebner
2021-04-08 10:33 ` [pve-devel] [POC qemu-server 3/6] draft of upgrade_qemu function Fabian Ebner
2021-04-08 10:33 ` [pve-devel] [POC qemu-server 4/6] draft of qemuupgrade API call Fabian Ebner
2021-04-08 10:33 ` Fabian Ebner [this message]
2021-04-08 10:33 ` [pve-devel] [POC qemu-server 6/6] add usleep parameter to savevm_monitor Fabian Ebner
2021-04-08 16:44 ` [pve-devel] [POC qemu-server] fix 3303: allow "live" upgrade of qemu version Thomas Lamprecht
2021-06-23 17:56   ` Laurent GUERBY

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=20210408103316.7619-6-f.ebner@proxmox.com \
    --to=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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal