search for: finalization_timeout

...let nr_disks = List.length targets in let image_uuids = - List.map ( - fun t -> + List.mapi ( + fun i t -> let id = t.target_overlay.ov_source.s_disk_id in let diskid_file = diskid_file_of_id id in if not (wait_for_file diskid_file finalization_timeout) then error (f_"transfer of disk %d/%d failed, see earlier error messages") - (id+1) nr_disks; + (i+1) nr_disks; let diskid = read_whole_file diskid_file in diskid ) targets in -- 2.18.0

...of the * transfer. *) - let nr_disks = List.length targets in - let image_uuids = - List.mapi ( - fun i t -> - let id = t.target_overlay.ov_source.s_disk_id in - let diskid_file = diskid_file_of_id id in - if not (wait_for_file diskid_file finalization_timeout) then - error (f_"transfer of disk %d/%d failed, see earlier error messages") - (i+1) nr_disks; - let diskid = read_whole_file diskid_file in - diskid - ) targets in + let id = t.target_overlay.ov_source.s_disk_id in + let diskid_fi...

...rhv-upload: must use ‘-oo rhv-cafile’ to supply the path to the oVirt or RHV user’s ‘ca.pem’ file"); { rhv_cafile; rhv_cluster; rhv_direct; rhv_verifypeer; rhv_disk_uuids } @@ -92,6 +90,10 @@ let nbdkit_python_plugin = Config.virt_v2v_nbdkit_python_plugin let pidfile_timeout = 30 let finalization_timeout = 5*60 +let json_optstring = function + | Some s -> JSON.String s + | None -> JSON.Null + class output_rhv_upload output_alloc output_conn output_password output_storage rhv_options = @@ -195,7 +197,7 @@ See also the virt-v2v-output-rhv(1...

...upload.ml index f5e0e6b1c..d8f608cff 100644 --- a/v2v/output_rhv_upload.ml +++ b/v2v/output_rhv_upload.ml @@ -78,6 +78,7 @@ let parse_output_options options = { rhv_cafile; rhv_cluster; rhv_direct; rhv_verifypeer } +let nbdkit_python_plugin = "python" let pidfile_timeout = 30 let finalization_timeout = 5*60 @@ -139,14 +140,14 @@ class output_rhv_upload output_alloc output_conn *) let error_unless_nbdkit_python_plugin_working () = let cmd = sprintf "nbdkit %s %s --dump-plugin >/dev/null" - Python_script.python + nbdkit_python_p...

...t; let image_uuids = > - List.map ( > - fun t -> > + List.mapi ( > + fun i t -> > let id = t.target_overlay.ov_source.s_disk_id in > let diskid_file = diskid_file_of_id id in > if not (wait_for_file diskid_file finalization_timeout) then > error (f_"transfer of disk %d/%d failed, see earlier error messages") > - (id+1) nr_disks; > + (i+1) nr_disks; This works only when the input is based on libvirt, and produce e.g. "transfer of disk 0/1 failed" when...

This patch series fixes various issues in the rhv-upload output mode: - properly find and use RHV resources - cleanup orphan disks, and possibly the current disk transfer on failure In reality, the first 4 patches deal with resources, and the other 4 with cleanups. The latter block can be theoretically sent alone -- I just happened to start working on it as part of my "let's fix

...upload.ml +++ b/v2v/output_rhv_upload.ml @@ -78,7 +78,7 @@ let parse_output_options options = { rhv_cafile; rhv_cluster; rhv_direct; rhv_verifypeer } -let nbdkit_python_plugin = "python" +let nbdkit_python_plugin = Config.virt_v2v_nbdkit_python_plugin let pidfile_timeout = 30 let finalization_timeout = 5*60 -- 2.20.1

For interest only, here is the patch required to make -o rhv-upload work with Python 2 (for RHEL 7). I don't think we want this upstream. A couple of remarks: * It's supposed to be possible to add ‘coding: utf-8’ to the top of .py files to make Python 2 accept that the file is UTF-8 (otherwise it gives an error on loading). However I added this and it didn't appear to make any

...et parse_output_options options = { rhv_cafile; rhv_cluster; rhv_direct; rhv_verifypeer } -let nbdkit_python_plugin = "python" +let python_intepreter = Config.virt_v2v_python_interpreter +let nbdkit_python_plugin = Config.virt_v2v_nbdkit_python_plugin let pidfile_timeout = 30 let finalization_timeout = 5*60 @@ -97,21 +98,32 @@ class output_rhv_upload output_alloc output_conn (* Create Python scripts for precheck, plugin and create VM. *) let precheck_script = Python_script.create ~name:"rhv-upload-precheck.py" + ~python:python_intepreter...

Mainly minor fixes and code cleanups over the v4 patch. There are still several problems with this patch, but it is in a reviewable state, especially the Python code. Rich.

...c., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + *) + +open Printf +open Unix + +open Std_utils +open Tools_utils +open Unix_utils +open Common_gettext.Gettext + +open Types +open Utils + +let python3 = "python3" (* Defined by PEP 394 *) +let pidfile_timeout = 30 +let finalization_timeout = 5*60 + +class output_rhv_upload output_alloc output_conn + output_password output_storage + rhv_cafile rhv_direct = + (* Create a temporary directory which will be deleted on exit. *) + let tmpdir = + let base_dir = (open_guestfs ())#get_cachedir...

...t; + > +open Printf > +open Unix > + > +open Std_utils > +open Tools_utils > +open Unix_utils > +open Common_gettext.Gettext > + > +open Types > +open Utils > + > +let python3 = "python3" (* Defined by PEP 394 *) > +let pidfile_timeout = 30 > +let finalization_timeout = 5*60 > + > +class output_rhv_upload output_alloc output_conn > + output_password output_storage > + rhv_cafile rhv_direct = > + (* Create a temporary directory which will be deleted on exit. *) > + let tmpdir = > + let base_d...

...t; + > +open Printf > +open Unix > + > +open Std_utils > +open Tools_utils > +open Unix_utils > +open Common_gettext.Gettext > + > +open Types > +open Utils > + > +let python3 = "python3" (* Defined by PEP 394 *) > +let pidfile_timeout = 30 > +let finalization_timeout = 5*60 > + > +class output_rhv_upload output_alloc output_conn > + output_password output_storage > + rhv_cafile rhv_direct = > + (* Create a temporary directory which will be deleted on exit. *) > + let tmpdir = > + let base_d...

...+ > +open Std_utils > +open Tools_utils > +open Unix_utils > +open Common_gettext.Gettext > + > +open Types > +open Utils > + > +let python3 = "python3" (* Defined by PEP 394 *) > +let pidfile_timeout = 30 > +let finalization_timeout = 5*60 > + > +class output_rhv_upload output_alloc output_conn > +                        output_password output_storage > +                        rhv_cafile rhv_direct = > +  (* Create a temporary directory which will be deleted on exit. *) > +  let tmpdi...

v5 was here: https://www.redhat.com/archives/libguestfs/2018-March/msg00032.html There is only a single patch in this version because the other patches went upstream. This patch adds the virt-v2v -o rhv-upload mode (https://bugzilla.redhat.com/show_bug.cgi?id=1557273). Compared to v5, this adds the ability to make zero, trim and flush requests to the oVirt imageio server

...c., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + *) + +open Printf +open Unix + +open Std_utils +open Tools_utils +open Unix_utils +open Common_gettext.Gettext + +open Types +open Utils + +let python3 = "python3" (* Defined by PEP 394 *) +let pidfile_timeout = 30 +let finalization_timeout = 5*60 + +class output_rhv_upload output_alloc output_conn + output_password output_storage + rhv_cafile rhv_cluster + rhv_direct rhv_verifypeer = + (* Create a temporary directory which will be deleted on exit. *) + let tmpdir...

Previous versions: v3: https://www.redhat.com/archives/libguestfs/2018-March/msg00000.html v2: https://www.redhat.com/archives/libguestfs/2018-February/msg00177.html v1: https://www.redhat.com/archives/libguestfs/2018-February/msg00139.html This completely rethinks the approach taken by the previous patches. Instead of trying to involve qemu's curl driver, this uses a small Python 3

...user’s ‘ca.pem’ file") in + let rhv_cluster = !rhv_cluster in + let rhv_direct = !rhv_direct in + let rhv_verifypeer = !rhv_verifypeer in + + { rhv_cafile; rhv_cluster; rhv_direct; rhv_verifypeer } + +let python3 = "python3" (* Defined by PEP 394 *) +let pidfile_timeout = 30 +let finalization_timeout = 5*60 + +class output_rhv_upload output_alloc output_conn + output_password output_storage + rhv_options = + (* Create a temporary directory which will be deleted on exit. *) + let tmpdir = + let base_dir = (open_guestfs ())#get_cachedir () in +...

v7 was here: https://www.redhat.com/archives/libguestfs/2018-March/msg00143.html Since then: - Earlier patches are now upstream. - The to-do list is moved from the commit message to the TODO file. - This version forces -of raw + -oa sparse and gives an error in any other mode. We intend to lift these restrictions later. - Tested against latest imageio which supports longer timeouts,

...user’s ‘ca.pem’ file") in + let rhv_cluster = !rhv_cluster in + let rhv_direct = !rhv_direct in + let rhv_verifypeer = !rhv_verifypeer in + + { rhv_cafile; rhv_cluster; rhv_direct; rhv_verifypeer } + +let python3 = "python3" (* Defined by PEP 394 *) +let pidfile_timeout = 30 +let finalization_timeout = 5*60 + +class output_rhv_upload output_alloc output_conn + output_password output_storage + rhv_options = + (* Create a temporary directory which will be deleted on exit. *) + let tmpdir = + let base_dir = (open_guestfs ())#get_cachedir () in +...