[Libguestfs] [PATCH virt-v2v 3/3] output: Wait up to 5 seconds for nbdkit or qemu-nbd to exit

Before exiting virt-v2v, wait a few seconds for nbdkit or qemu-nbd subprocesses to exit. We expect they will exit almost instaneously so this won't have much effect. However in the -o rhv case it's helpful to wait briefly to ensure that the NFS mountpoint is released before we try to unmount it (also during shutdown). https://bugzilla.redhat.com/show_bug.cgi?id=1953286#c26 --- output/output.ml | 4 ++-- common | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/output/output.ml b/output/output.ml index 23c3932d1b..9754897fae 100644 --- a/output/output.ml +++ b/output/output.ml @@ -118,7 +118,7 @@ let output_to_local_file ?(changeuid = fun f -> f ()) ?(compressed = false) (* --exit-with-parent should ensure nbdkit is cleaned * up when we exit, but it's not supported everywhere. *) - On_exit.kill pid + On_exit.kill ~wait:5 pid | "qcow2" -> let cmd = @@ -140,7 +140,7 @@ let output_to_local_file ?(changeuid = fun f -> f ()) ?(compressed = false) ) in QemuNBD.set_snapshot cmd false; let _, pid = QemuNBD.run_unix socket cmd in - On_exit.kill pid + On_exit.kill ~wait:5 pid | _ -> error (f_"output mode only supports raw or qcow2 format (format: %s)") diff --git a/common b/common index a2446619e2..f94f9eef4c 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit a2446619e2ad668edbaab1decc999c518ae24615 +Subproject commit f94f9eef4c2fddabbc943ccb6b431e19ec5260c3 -- 2.37.0.rc2