From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id 10D311FF15E
for <inbox@lore.proxmox.com>; Tue, 20 May 2025 15:15:14 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id BBF4A1D548;
Tue, 20 May 2025 15:15:12 +0200 (CEST)
From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Tue, 20 May 2025 15:14:31 +0200
Message-Id: <20250520131431.487048-1-f.ebner@proxmox.com>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250519144357.3515197-1-d.csapak@proxmox.com>
References: <20250519144357.3515197-1-d.csapak@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.035 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DMARC_MISSING 0.1 Missing DMARC policy
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to
Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more
information.
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
Subject: [pve-devel] [PATCH qemu-server] migrate: code cleanup: factor out
variables for transferred memory and vfio
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
I'll apply together with this follow-up if somebody gives me a T-b/R-b
PVE/QemuMigrate.pm | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
index f72a9d33..5a54f173 100644
--- a/PVE/QemuMigrate.pm
+++ b/PVE/QemuMigrate.pm
@@ -1286,6 +1286,9 @@ sub phase2 {
my $memstat = $stat->{ram};
+ my $mem_transferred = $memstat->{transferred} || 0;
+ my $vfio_transferred = $stat->{vfio}->{transferred} || 0;
+
if ($status eq 'completed') {
my $delay = time() - $start;
if ($delay > 0) {
@@ -1294,11 +1297,9 @@ sub phase2 {
my $downtime = $stat->{downtime} || 0;
$self->log('info', "average migration speed: $avg_speed/s - downtime $downtime ms");
}
- my $trans = $memstat->{transferred} || 0;
- my $vfio_transferred = $stat->{vfio}->{transferred} || 0;
- if ($trans > 0 || $vfio_transferred > 0) {
- my $transferred_h = render_bytes($trans, 1);
+ if ($mem_transferred > 0 || $vfio_transferred > 0) {
+ my $transferred_h = render_bytes($mem_transferred, 1);
my $summary = "transferred $transferred_h VM-state";
if ($vfio_transferred > 0) {
@@ -1321,14 +1322,9 @@ sub phase2 {
last;
}
- if (
- $memstat->{transferred} ne $last_mem_transferred
- || (defined($stat->{vfio}->{transferred})
- && $stat->{vfio}->{transferred} ne $last_vfio_transferred)
- )
- {
- my $trans = $memstat->{transferred} || 0;
- my $vfio_transferred = $stat->{vfio}->{transferred} || 0;
+ if ($mem_transferred ne $last_mem_transferred
+ || $vfio_transferred ne $last_vfio_transferred
+ ) {
my $rem = $memstat->{remaining} || 0;
my $total = $memstat->{total} || 0;
my $speed = ($memstat->{'pages-per-second'} // 0) * ($memstat->{'page-size'} // 0);
@@ -1341,7 +1337,7 @@ sub phase2 {
my $should_log = $usleep > 100_000 ? 1 : ($i % 10) == 0;
my $total_h = render_bytes($total, 1);
- my $transferred_h = render_bytes($trans, 1);
+ my $transferred_h = render_bytes($mem_transferred, 1);
my $speed_h = render_bytes($speed, 1);
my $progress = "transferred $transferred_h of $total_h VM-state, ${speed_h}/s";
@@ -1391,8 +1387,8 @@ sub phase2 {
}
}
- $last_mem_transferred = $memstat->{transferred};
- $last_vfio_transferred = $stat->{vfio}->{transferred} // 0;
+ $last_mem_transferred = $mem_transferred;
+ $last_vfio_transferred = $vfio_transferred;
}
if ($self->{storage_migration}) {
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel