search for: nr_disk

...+), 3 deletions(-) diff --git a/v2v/output_rhv_upload.ml b/v2v/output_rhv_upload.ml index 6260eaac5..df91a117f 100644 --- a/v2v/output_rhv_upload.ml +++ b/v2v/output_rhv_upload.ml @@ -361,13 +361,13 @@ If the messages above are not sufficient to diagnose the problem then add the *) 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 finalizatio...

.../conversion.c b/p2v/conversion.c index 9f5a3ad..4ff7ecc 100644 --- a/p2v/conversion.c +++ b/p2v/conversion.c @@ -100,6 +100,7 @@ start_conversion (struct config *config, void (*notify_ui) (int type, const char *data)) { int ret = -1; + int status; size_t i, len; size_t nr_disks = guestfs___count_strings (config->disks); struct data_conn data_conns[nr_disks]; @@ -276,7 +277,7 @@ start_conversion (struct config *config, if (mexp_printf (control_h, " ) | tee %s/virt-v2v-conversion-log.txt", remote_dir) == -1) goto printf_fail; -...

...:" ^ JSON.string_of_doc json_params) ) overlays - method create_metadata source targets _ guestcaps inspect target_firmware = - (* Get the UUIDs of each disk image. These files are written - * out by the nbdkit plugins on successful finalization of the + method disk_copied t i nr_disks = + (* Get the UUID of the disk image. This file is written + * out by the nbdkit plugin on successful finalization of the * transfer. *) - let nr_disks = List.length targets in - let image_uuids = - List.mapi ( - fun i t -> - let id = t.target_ove...

...sks were discovered on this machine.\n", - guestfs_int_program_name); - fprintf (stderr, "virt-p2v looked in /sys/block.\n"); - fprintf (stderr, "This is a fatal error and virt-p2v cannot continue.\n"); - exit (EXIT_FAILURE); - } - - qsort (all_disks, nr_disks, sizeof (char *), compare); + if (all_disks) + qsort (all_disks, nr_disks, sizeof (char *), compare); if (all_removable) qsort (all_removable, nr_removable, sizeof (char *), compare); } -- 2.4.3

...if not do_copy then targets - else ( - (* Copy the source to the output. *) - at_exit (fun () -> - if !delete_target_on_exit then ( - List.iter ( - fun t -> try unlink t.target_file with _ -> () - ) targets - ) - ); - let nr_disks = List.length targets in - mapi ( - fun i t -> - message (f_"Copying disk %d/%d to %s (%s)") - (i+1) nr_disks t.target_file t.target_format; - if verbose () then printf "%s%!" (string_of_target t); - - (* We noticed that qemu...

...a/v2v/output_rhv_upload.ml b/v2v/output_rhv_upload.ml > index 6260eaac5..df91a117f 100644 > --- a/v2v/output_rhv_upload.ml > +++ b/v2v/output_rhv_upload.ml > @@ -361,13 +361,13 @@ If the messages above are not sufficient to diagnose the problem then add the > *) > 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 no...

...10 +687,10 @@ and copy_targets cmdline targets input output = fun i t -> (match t.target_file with | TargetFile s -> - message (f_"Copying disk %d/%d to %s (%s)") + message (f_"Preparing disk %d/%d in %s (%s)") (i+1) nr_disks s t.target_format; | TargetURI s -> - message (f_"Copying disk %d/%d to qemu URI %s (%s)") + message (f_"Preparing disk %d/%d on qemu URI %s (%s)") (i+1) nr_disks s t.target_format ); debug "%s" (string_of_...

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

This changes the infrastructure to allow the target_file to be a QEMU URI. Rich.

...= EXIT_SUCCESS) + fprintf (stderr, "Try ‘%s --help’ for more information.\n", + getprogname ()); + else { + printf ("Test libguestfs with large/maximum number of disks.\n" + "\n" + "Usage:\n" + " %s -n NR_DISKS\n" + " Do a full test with NR_DISKS.\n" + " %s --max\n" + " Do a full test with the max number of disks *.\n" + " %s --just-add [-n N | --max]\n" + " Don't do a...

...eded, but still short enough. > diff --git a/p2v/conversion.c b/p2v/conversion.c > index f5c518a..8e90ef5 100644 > --- a/p2v/conversion.c > +++ b/p2v/conversion.c > @@ -167,7 +167,7 @@ start_conversion (struct config *config, > int status; > size_t i, len; > size_t nr_disks = guestfs_int_count_strings (config->disks); > - struct data_conn data_conns[nr_disks]; > + CLEANUP_FREE struct data_conn *data_conns; Missing "= NULL" here. > diff --git a/src/appliance.c b/src/appliance.c > index dbde35e..d7cc60b 100644 > --- a/src/appliance.c &gt...

...ig, set_running (1); set_cancel_requested (0); + inhibit_fd = inhibit_sleep (); +#ifdef DEBUG_STDERR + if (inhibit_fd == -1) + fprintf (stderr, "warning: virt-p2v cannot inhibit power saving during conversion.\n"); +#endif + data_conns = malloc (sizeof (struct data_conn) * nr_disks); if (data_conns == NULL) error (EXIT_FAILURE, errno, "malloc"); @@ -426,6 +433,9 @@ start_conversion (struct config *config, } cleanup_data_conns (data_conns, nr_disks); + if (inhibit_fd >= 0) + close (inhibit_fd); + set_running (0); return ret; diff --git...

...- ) + ); + + (* Let the output mode know that the disk was copied successfully, + * so it can perform any operations without waiting for all the + * other disks to be copied (i.e. before the metadata is actually + * created). + *) + output#disk_copied t i nr_disks ) targets (* Update the target_actual_size field in the target structure. *) -- 2.21.0

(I don't have a BZ# for this yet, but I'm expecting it to be filed as an RFE) Currently if the user is in the virt-p2v GUI and cancels the conversion, all that happens is we abruptly close the ssh session to virt-v2v. That is bad .. possibly (or maybe not). But in any case there is an alternative: we can send a ^C key to the virt-v2v process, which it could catch and handle gracefully,

...); + (* Copy overlays to target (for [--in-place] this does nothing). *) (match conversion_mode with | In_place -> () @@ -685,6 +701,7 @@ and copy_targets cmdline targets input output = message (f_"Copying disk %d/%d to qemu URI %s (%s)") (i+1) nr_disks s t.target_format ); + debug "%s" (string_of_overlay t.target_overlay); debug "%s" (string_of_target t); (* We noticed that qemu sometimes corrupts the qcow2 file on diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod index faf8c0ba2..bbd6985e4 100644 -...

This patch implements output to OpenStack Cinder volumes using OpenStack APIs. It has only been lightly tested, but appears to work. There are some important things to understand about how this works: (1) You must run virt-v2v in a conversion appliance running on top of OpenStack. And you must supply the name or UUID of this appliance to virt-v2v using the ‘-oo server-id=NAME|UUID’ parameter.

...BUFSIZ)) > 0) { *bytes_rtn += r; } if (r == -1) { diff --git a/p2v/conversion.c b/p2v/conversion.c index f5c518a..8e90ef5 100644 --- a/p2v/conversion.c +++ b/p2v/conversion.c @@ -167,7 +167,7 @@ start_conversion (struct config *config, int status; size_t i, len; size_t nr_disks = guestfs_int_count_strings (config->disks); - struct data_conn data_conns[nr_disks]; + CLEANUP_FREE struct data_conn *data_conns; CLEANUP_FREE char *remote_dir = NULL, *libvirt_xml = NULL; time_t now; struct tm tm; @@ -184,6 +184,12 @@ start_conversion (struct config *config, set...

v1 was here: https://www.redhat.com/archives/libguestfs/2018-August/thread.html#00287 v2: - The -oa option now gives an error; apparently Cinder cannot generally control sparse/preallocated behaviour, although certain Cinder backends can. - The -os option maps to Cinder volume type; suggested by Matt Booth. - Add a simple test.

RHV was connecting to the VMware source in order to find out the virtual disk size of the source disk(s), duplicating logic that virt-v2v already provides. This makes that information available using a new ‘virt-v2v --print-target option’. Note in order to get all the information, this has to actually perform the conversion step, so it takes 30 seconds or so before we reach the point where the

...ssages above are not sufficient to diagnose the problem then add the "file.export", JSON.String "/"; ] in TargetURI ("json:" ^ JSON.string_of_doc json_params) - ) overlays + ) (List.combine overlays uuids) method disk_copied t i nr_disks = (* Get the UUID of the disk image. This file is written @@ -417,7 +443,14 @@ If the messages above are not sufficient to diagnose the problem then add the disks_uuids <- disks_uuids @ [diskid]; method create_metadata source targets _ guestcaps inspect target_firmware = - a...