8190ec8540
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
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From 1945253e1e51a48585c5d595795caba54751b250 Mon Sep 17 00:00:00 2001
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
Date: Sun, 28 Sep 2014 19:14:43 +0100
|
|
Subject: [PATCH] RHEL: v2v: Select correct qemu binary for -o qemu mode
|
|
(RHBZ#1147313).
|
|
|
|
RHEL does not have qemu-system-x86_64 (etc), and in addition the
|
|
qemu binary is located in /usr/libexec. Encode the path to this
|
|
binary directly in the script.
|
|
|
|
Note that we don't support people running qemu directly like this.
|
|
It's just for quick testing of converted VMs, and to help us with
|
|
support cases.
|
|
---
|
|
output/output_qemu.ml | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/output/output_qemu.ml b/output/output_qemu.ml
|
|
index 0aac1eba..c4265703 100644
|
|
--- a/output/output_qemu.ml
|
|
+++ b/output/output_qemu.ml
|
|
@@ -119,7 +119,7 @@ and qemu_finalize dir source inspect target_meta
|
|
* module deals with shell and qemu comma quoting.
|
|
*)
|
|
let cmd = Qemuopts.create () in
|
|
- Qemuopts.set_binary_by_arch cmd (Some guestcaps.gcaps_arch);
|
|
+ Qemuopts.set_binary cmd "/usr/libexec/qemu-kvm";
|
|
|
|
let flag = Qemuopts.flag cmd
|
|
and arg = Qemuopts.arg cmd
|
|
--
|
|
2.31.1
|
|
|