From: Warren Usui <warren.usui@inktank.com>
Date: Sat, 16 Mar 2013 01:18:56 +0000 (-0700)
Subject: Fixed ceph-fuse mount point cleanup bug
X-Git-Tag: 1.1.0~2239
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c55f12887b81659a6cf798e5de7bd9df7f80820d;p=teuthology.git

Fixed ceph-fuse mount point cleanup bug

Tested for the existence of /sys/fs/fuse/connections/*/abort
before clobbering it.  This problem was generated when all
the machines were virtual CentOS machines.

Signed-off-by: Warren Usui <warren.usui@inktank.com>
---

diff --git a/teuthology/task/ceph-fuse.py b/teuthology/task/ceph-fuse.py
index 26b2dd5ba..caa21fa42 100644
--- a/teuthology/task/ceph-fuse.py
+++ b/teuthology/task/ceph-fuse.py
@@ -144,10 +144,13 @@ def task(ctx, config):
               # abort the fuse mount, killing all hung processes
               remote.run(
                   args=[
+                      'if', 'test', '-e', '/sys/fs/fuse/connections/*/abort',
+                      run.Raw(';'), 'then',
                       'echo',
                       '1',
                       run.Raw('>'),
                       run.Raw('/sys/fs/fuse/connections/*/abort'),
+                      run.Raw(';'), 'fi',
                       ],
                  )
               # make sure its unmounted