These two patches fix potential issues. Best to get them tested over
Christmas and New Year.
v2v: Swap over the output and conversion stages
In old virt-v2v, we did (approximately, since the steps were not as
clear):
Input -> Convert -> Output -> Copy -> Finalize
After modularizing virt-v2v we changed this to:
Input -> Output -> Convert -> Copy -> Finalize
However this has a (sort of) problem. For -o rhv-upload when we start
the nbdkit rhv-upload-plugin machinery, it obtains a time-limited
ticket from imageio. This ticket could expire if the conversion step
takes longer than a certain time (60 seconds by default, may be
increased in a future version of oVirt).
I believe this is really a problem in imageio or that the
rhv-upload-plugin should really renew this ticket automatically, but
it does not, instead failing. (The ticket *is* renewed automatically
whenever a request is sent to imageio, but in this case no requests
are being sent).
Anyway the easiest thing is to switch the ordering back to how it was
in old virt-v2v (at top). It doesn't make a difference for any other
output modes.
Reported-by: Nir Soffer
and:
v2v: Remove nbdcopy --request-size=4M flag
This was added when we were setting the cow-block-size to 1M. However
since commit 351d61f768 ("input: -it vddk: Reduce cow-block-size to 4K")
we stopped doing that so this is no longer needed.
Reverts: commit 08e764959ec9dadd71a95d22d3d88d647a18d165
Related: rhbz#2011713
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
Add pending upstream patches (v2) for 1961107.
resolves: rhbz#2011713
--
Original commit messages:
prepare dist-git branch for rebase to 1.45.91 by Laszlo
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Take some spec file mods from "Virt-v2v 2.0 modular test 9." by Rich
Origin: Message-Id: <20211114151337.880321-1-rjones@redhat.com>.
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
refresh patch list, %changelog, Release, for 1.45.91 + RHBZ#1961107 v2
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
