From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 1A45A716B0 for ; Thu, 8 Apr 2021 12:33:53 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1663919F7E for ; Thu, 8 Apr 2021 12:33:23 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 23EA819F66 for ; Thu, 8 Apr 2021 12:33:21 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id E1B7B459E7 for ; Thu, 8 Apr 2021 12:33:20 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 8 Apr 2021 12:33:15 +0200 Message-Id: <20210408103316.7619-6-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210408103316.7619-1-f.ebner@proxmox.com> References: <20210408103316.7619-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.007 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemuserver.pm] Subject: [pve-devel] [POC qemu-server 5/6] add timing for testing X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Apr 2021 10:33:53 -0000 Signed-off-by: Fabian Ebner --- 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