task/ceph-fuse: If umount fails, abort and cleanup

Signed-off-by: Sam Lang <sam.lang@inktank.com>

diff --git a/teuthology/task/ceph-fuse.py b/teuthology/task/ceph-fuse.py
index ee619c953e75c2617c333b6ac4e61d5193b0681a..555ccaa5e5d47fb996f9da6de64285b39a267fc2 100644 (file)
--- a/teuthology/task/ceph-fuse.py
+++ b/teuthology/task/ceph-fuse.py
@@ -126,13 +126,35 @@ def task(ctx, config):
         log.info('Unmounting ceph-fuse clients...')
         for id_, remote in clients:
             mnt = os.path.join('/tmp/cephtest', 'mnt.{id}'.format(id=id_))
-            remote.run(
-                args=[
-                    'fusermount',
-                    '-u',
-                    mnt,
-                    ],
-                )
+            try:
+              remote.run(
+                  args=[
+                      'fusermount',
+                      '-u',
+                      mnt,
+                      ],
+                  )
+            except CommandFailedError as e:
+              # abort the fuse mount, killing all hung processes
+              remote.run(
+                  args=[
+                      'echo',
+                      '1',
+                      run.Raw('>'),
+                      run.Raw('/sys/fs/fuse/connections/*/abort'),
+                      ],
+                 )
+              # make sure its unmounted
+              remote.run(
+                  args=[
+                      'sudo',
+                      'umount',
+                      '-l',
+                      '-f',
+                      mnt,
+                      ],
+                  )
+
         run.wait(fuse_daemons.itervalues())
 
         for id_, remote in clients: