Merge "ensure libguestfs has completed before proceeding"

1 files changed, 12 insertions, 1 deletions

diff --git a/nova/virt/disk/guestfs.py b/nova/virt/disk/guestfs.py
index bf7a286e0..f2ff3c371 100644
--- a/nova/virt/disk/guestfs.py
+++ b/nova/virt/disk/guestfs.py
@@ -88,8 +88,19 @@ class Mount(mount.Mount):
     def unmnt_dev(self):
         if not self.mounted:
             return
-        utils.execute('sync')
         # root users don't need a specific unmnt_dev()
         # but ordinary users do
         utils.execute('fusermount', '-u', self.mount_dir, run_as_root=True)
+
+        # Unfortunately FUSE has an issue where it doesn't wait
+        # for processes associated with the mount to terminate.
+        # Therefore we do this manually here.  Note later versions
+        # of guestmount have the --pid-file option to help with this.
+        # Here we check every .2 seconds whether guestmount is finished
+        # but do this for at most 10 seconds.
+        wait_cmd = 'until ! ps -C guestmount -o args= | grep -qF "%s"; '
+        wait_cmd += 'do sleep .2; done'
+        wait_cmd %= self.mount_dir
+        utils.execute('timeout', '10s', 'sh', '-c', wait_cmd)
+
         self.mounted = False