Print nbdcopy command in debug output

resolves: RHEL-86022
This commit is contained in:
Richard W.M. Jones 2025-04-04 14:55:55 +01:00
parent 00e965efce
commit 51042a99b1
2 changed files with 40 additions and 2 deletions

View File

@ -0,0 +1,35 @@
From 193ed2a762bf3182d760370739c7add83e89f21c Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 4 Apr 2025 14:47:09 +0100
Subject: [PATCH] v2v: Print nbdcopy command in debug output
Commit fd1148f795 ("v2v: Implement --parallel=N for parallel disk
copies") changed how we run nbdcopy from using Tools_utils.run_command
to calling Unix.execvp directly. However a side effect of this is
that we no longer printed the nbdcopy command that we were about to
run in verbose mode. Fix this by printing it in debug output.
Reported-by: Ming Xie
Fixes: https://issues.redhat.com/browse/RHEL-86022
Fixes: commit fd1148f79581b148525eb12154aef7603ccf0baa
(cherry picked from commit 802172c1a868e9287416d26e77a94d01c2d7b871)
---
v2v/v2v.ml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/v2v/v2v.ml b/v2v/v2v.ml
index 3436ce14..10d24364 100644
--- a/v2v/v2v.ml
+++ b/v2v/v2v.ml
@@ -713,7 +713,10 @@ and nbdcopy ?request_size output_alloc input_uri output_uri =
if not (quiet ()) then List.push_back cmd "--progress";
if output_alloc = Types.Preallocated then List.push_back cmd "--allocated";
- let args = Array.of_list !cmd in
+ let args = !cmd in
+ debug "%s" (stringify_args args);
+
+ let args = Array.of_list args in
match fork () with
| 0 ->
(* Child process (nbdcopy). *)

View File

@ -8,7 +8,7 @@
Name: virt-v2v
Epoch: 1
Version: 2.7.1
Release: 7%{?dist}
Release: 8%{?dist}
Summary: Convert a virtual machine to run on KVM
License: GPL-2.0-or-later AND LGPL-2.0-or-later
@ -65,6 +65,7 @@ Patch0034: 0034-Update-common-submodule.patch
Patch0035: 0035-build-Remove-with-virt-v2v-nbdkit-python-plugin.patch
Patch0036: 0036-build-Use-nbdcopy-and-nbdinfo-from-.-configure.patch
Patch0037: 0037-v2v-Use-nbdcopy-blkhash-in-verbose-mode.patch
Patch0038: 0038-v2v-Print-nbdcopy-command-in-debug-output.patch
%if !0%{?rhel}
# libguestfs hasn't been built on i686 for a while since there is no
@ -366,11 +367,13 @@ make -C tests TESTS=test-fedora-luks-on-lvm-conversion.sh check
%changelog
* Mon Mar 31 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.1-7
* Fri Apr 04 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.1-8
- mlcustomize: Remove dnf --verbose option
resolves: RHEL-83289
- Print blkhash of converted image in virt-v2v debugging output
resolves: RHEL-85512
- Print nbdcopy command in debug output
resolves: RHEL-86022
* Tue Feb 25 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.1-5
- Rebase to upstream development version 2.7.1