rpms/virt-v2v
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert "output: Don't use nbdkit-file-plugin cache=none when writing"

Browse Source 
Backport the following upstream commit:
5d5383b912

Require nbdkit >= 1.28.3-2.el9 since that contains the associated
optimization to write eviction in the file plugin:

a956e2e75d

related: rhbz#2011713
This commit is contained in:
Richard W.M. Jones 2021-12-08 11:26:09 +00:00
parent 94cf9be0f8
commit db9d8a6e4c
2 changed files with 48 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
0011-Revert-output-Don-t-use-nbdkit-file-plugin-cache-non.patch Normal file
View File

@ -0,0 +1,44 @@
From 2ff5ee8bde44b5d0ff7ff3cbc732abb17c559979 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 7 Dec 2021 21:30:09 +0000
Subject: [PATCH] Revert "output: Don't use nbdkit-file-plugin cache=none when
writing"
I have now fixed the implementation of cache=none in nbdkit, so this
reverts the previous commit (except we still drop fadvise=sequential
as that is not needed).
You must have nbdkit >= 1.29.10 with this commit otherwise performance
will be poor:
https://gitlab.com/nbdkit/nbdkit/-/commit/a956e2e75d6c88eeefecd967505667c9f176e3af
This reverts commit ac59d3b2310511b1537d408b675b19ec9a5d384e.
(cherry picked from commit 5d5383b91280aeb59b84f442ac333dc700a04d0c)
---
output/output.ml | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/output/output.ml b/output/output.ml
index f829fe43..414f01eb 100644
--- a/output/output.ml
+++ b/output/output.ml
@@ -98,14 +98,7 @@ let output_to_local_file ?(changeuid = fun f -> f ())
let cmd = Nbdkit.add_arg cmd "file" filename in
let cmd =
if Nbdkit.version nbdkit_config >= (1, 22, 0) then (
- (* nbdkit 1.28 has a very naive implementation of
- * page cache eviction. We need to copy the one from
- * nbdcopy copy/file-ops.c. Until then do not use
- * this flag because it causes a large slow down on
- * some machines. XXX
- *)
- (*let cmd = Nbdkit.add_arg cmd "fadvise" "sequential" in
- let cmd = Nbdkit.add_arg cmd "cache" "none" in*)
+ let cmd = Nbdkit.add_arg cmd "cache" "none" in
cmd
)
else cmd in
--
2.31.1

7
virt-v2v.spec
View File

@ -15,7 +15,7 @@
Name: virt-v2v
Epoch: 1
Version: 1.45.94
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Convert a virtual machine to run on KVM
License: GPLv2+
@ -61,6 +61,7 @@ Patch0007: 0007-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch
Patch0008: 0008-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch
Patch0009: 0009-RHEL-Disable-o-glance.patch
Patch0010: 0010-RHEL-Remove-the-in-place-option.patch
Patch0011: 0011-Revert-output-Don-t-use-nbdkit-file-plugin-cache-non.patch
%endif
%if 0%{patches_touch_autotools}
@ -135,7 +136,7 @@ Requires: libnbd >= 1.8.2-2.el9
Requires: %{_bindir}/qemu-nbd
Requires: %{_bindir}/nbdcopy
Requires: %{_bindir}/nbdinfo
Requires: nbdkit-server >= 1.28.3-1.el9
Requires: nbdkit-server >= 1.28.3-2.el9
Requires: nbdkit-curl-plugin
Requires: nbdkit-file-plugin
Requires: nbdkit-nbd-plugin
@ -301,7 +302,7 @@ popd
%changelog
* Tue Dec 07 2021 Richard W.M. Jones <rjones@redhat.com> - 1:1.45.94-2
* Wed Dec 08 2021 Richard W.M. Jones <rjones@redhat.com> - 1:1.45.94-3
- Rebase to upstream 1.45.94.
- Change video type to VGA (instead of QXL).
- Remove --in-place support properly.