]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
Fixed ceph-fuse mount point cleanup bug
authorWarren Usui <warren.usui@inktank.com>
Sat, 16 Mar 2013 01:18:56 +0000 (18:18 -0700)
committerSage Weil <sage@inktank.com>
Mon, 18 Mar 2013 20:35:58 +0000 (13:35 -0700)
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>
teuthology/task/ceph-fuse.py

index 26b2dd5ba19c66018996ff674d8f87a2bef86099..caa21fa42c5e70920fea76177ac8526bd5500a71 100644 (file)
@@ -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