search for: 1775200d3

--- v2v/v2v.ml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/v2v/v2v.ml b/v2v/v2v.ml index 09bc4f37d..1775200d3 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -31,6 +31,7 @@ open Utils open Cmdline module G = Guestfs +module IntSet = Set.Make(struct let compare = compare type t = int end) (* Conversion mode, either normal (copying) or [--in-place]. *) type conversion_mode = @@ -234,10 +235,15 @@ and ope...

...$f + +echo -n "Estimate: " +cat $f + +# Check the output is a single number. +if [ "$(cat $f | wc -l)" -ne 1 ]; then + echo "$0: expecting one line of output" + exit 1 +fi +grep -E '^[[:digit:]]+$' $f + +rm -f $f diff --git a/v2v/v2v.ml b/v2v/v2v.ml index 1775200d3..e24a9adf6 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -104,6 +104,12 @@ let rec main () = (* Decrypt the disks. *) inspect_decrypt g; + (* Print source disk size estimate and stop. *) + if cmdline.print_estimate then ( + print_source_disk_size_estimate cmdline g; + exit 0 + ); +...

...-o local -os $(pwd) \ + --print-estimate --quiet > $f + +echo "Estimate:" +cat $f + +# Check the output looks reasonable. This is not a very good test XXX. +grep "required" $f +grep "fully allocated size" $f + +rm -f $f diff --git a/v2v/v2v.ml b/v2v/v2v.ml index 1775200d3..23dea0012 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -156,6 +156,12 @@ let rec main () = (match conversion_mode with | In_place -> () | Copying overlays -> + (* Print copy size estimate and stop. *) + if cmdline.print_estimate then ( + print_copy_size_estimate cm...

...; +# Check the output is a single number. > +if [ "$(cat $f | wc -l)" -ne 1 ]; then > + echo "$0: expecting one line of output" > + exit 1 > +fi > +grep -E '^[[:digit:]]+$' $f > + > +rm -f $f > diff --git a/v2v/v2v.ml b/v2v/v2v.ml > index 1775200d3..e24a9adf6 100644 > --- a/v2v/v2v.ml > +++ b/v2v/v2v.ml > @@ -104,6 +104,12 @@ let rec main () = > (* Decrypt the disks. *) > inspect_decrypt g; > > + (* Print source disk size estimate and stop. *) > + if cmdline.print_estimate then ( > + print_source_disk_siz...

...--debug-gc \ + -i libvirtxml test-v2v-print-source.xml \ + -o local -os $(pwd) \ + --print-estimate --quiet > $f + +echo -n "Estimate: " +cat $f + +# Check the output looks reasonable. +grep -E '^[[:digit:]]+$' $f + +rm -f $f diff --git a/v2v/v2v.ml b/v2v/v2v.ml index 1775200d3..d7b791885 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -48,6 +48,8 @@ type mpstat = { let () = Random.self_init () +let sum = List.fold_left (+^) 0L + let rec main () = (* Handle the command line. *) let cmdline, input, output = parse_cmdline () in @@ -156,6 +158,22 @@ let rec main () =...

...--debug-gc \ + -i libvirtxml test-v2v-print-source.xml \ + -o local -os $(pwd) \ + --print-estimate --quiet > $f + +echo -n "Estimate: " +cat $f + +# Check the output looks reasonable. +grep -E '^[[:digit:]]+$' $f + +rm -f $f diff --git a/v2v/v2v.ml b/v2v/v2v.ml index 1775200d3..af04a265a 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -48,6 +48,8 @@ type mpstat = { let () = Random.self_init () +let sum = List.fold_left (+^) 0L + let rec main () = (* Handle the command line. *) let cmdline, input, output = parse_cmdline () in @@ -156,6 +158,17 @@ let rec main () =...

...ce.xml \ + -o local -os $(pwd) \ + --print-estimate \ + --machine-readable=file:$f + +echo -n "Estimate: " +cat $f + +# Check the total field exists and is numeric. +jq '.total' $f | grep -Esq '^[[:digit:]]+$' + +rm -f $f diff --git a/v2v/v2v.ml b/v2v/v2v.ml index 1775200d3..53a1041c5 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -48,6 +48,8 @@ type mpstat = { let () = Random.self_init () +let sum = List.fold_left (+^) 0L + let rec main () = (* Handle the command line. *) let cmdline, input, output = parse_cmdline () in @@ -156,6 +158,12 @@ let rec main () =...

...ibvirtxml test-v2v-print-source.xml \ + -o local -os $(pwd) \ + --print-estimate \ + --machine-readable=file:$f + +echo -n "Estimate: " +cat $f + +# Check the output looks reasonable. +grep -E 'total.*[[:digit:]]+' $f + +rm -f $f diff --git a/v2v/v2v.ml b/v2v/v2v.ml index 1775200d3..884dfecaa 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -48,6 +48,8 @@ type mpstat = { let () = Random.self_init () +let sum = List.fold_left (+^) 0L + let rec main () = (* Handle the command line. *) let cmdline, input, output = parse_cmdline () in @@ -156,6 +158,12 @@ let rec main () =...

v4: - Same as v3, but depends on and uses new --machine-readable work. Rich.

v6: - Make the text output a bit nicer. - Changes as suggested to Measure_disk module temp file & json parsing. - Use jq to test JSON output. - Retest.

v5: - Normal output modified approx as suggested in previous email. - Machine readable output uses JSON.

I rethought this again, as I think that it's a dangerous assumption to bake qemu-img measure output into our API. This patch series runs qemu-img measure behind the scenes, but then parses the output and sums it to a single number which we print. Doing that required a bit of reworking, moving the Jansson [JSON parser] bindings from virt-builder into the common directory and a couple of other