Attachment 597371 Details for Bug 835466 – A more direct workaround

[patch] A more direct workaround

fusermount-u-wait.diff (text/plain), 1.83 KB, created by Pádraig Brady on 2012-07-10 15:08:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pádraig Brady

Created: 2012-07-10 15:08:31 UTC

Size: 1.83 KB

patch

obsolete

>From 5ccd43fd466584fe4cefb8845fa691d33c18975c Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady@redhat.com>
>Date: Tue, 10 Jul 2012 15:22:39 +0100
>Subject: [PATCH] ensure libguestfs has completed before proceeding
>
>This is a more correct fix than the previous
>sync(1) which probably only changed timings
>masking the real issue.
>
>The FUSE issue is referenced here:
>http://code.google.com/p/s3ql/issues/detail?id=159
>which in turn references this thread on the subject from 2006:
>http://thread.gmane.org/gmane.comp.file-systems.fuse.devel/3903
>And another case from 2008:
>http://permalink.gmane.org/gmane.comp.file-systems.fuse.devel/6502
>
>Fixes bug: 1013689
>
>Change-Id: I36fd11d5f01562f65a6b6f07e759ea066490b067
>---
> nova/virt/disk/guestfs.py |   12 ++++++++++++
> 1 files changed, 12 insertions(+), 0 deletions(-)
>
>diff --git a/nova/virt/disk/guestfs.py b/nova/virt/disk/guestfs.py
>index 1e56e2a..682f2ce 100644
>--- a/nova/virt/disk/guestfs.py
>+++ b/nova/virt/disk/guestfs.py
>@@ -91,4 +91,16 @@ class Mount(mount.Mount):
>         # root users don't need a specific unmnt_dev()
>         # but ordinary users do
>         utils.execute('fusermount', '-u', self.mount_dir, run_as_root=True, attempts=4)
>+
>+        # 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
>-- 
>1.7.6.4
>

Actions: View | Diff

Attachments on bug 835466: 594410 | 596883 | 597041 | 597068 | 597371