]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mount.fuse.ceph: strip the 'nofail' option from those that fuse will see
authorLeonid Usov <leonid.usov@ibm.com>
Sun, 6 Aug 2023 08:28:40 +0000 (11:28 +0300)
committerLeonid Usov <leonid.usov@ibm.com>
Sun, 6 Aug 2023 08:28:40 +0000 (11:28 +0300)
Signed-off-by: Leonid Usov <leonid.usov@ibm.com>
Fixes: https://tracker.ceph.com/issues/58394
src/mount.fuse.ceph

index 59a296d964fecea1a9d68faaa37fc3b8c76d87e3..c4b61dbcbd2cfe346ff539b3ba1154ab3bdd900d 100755 (executable)
@@ -39,8 +39,11 @@ def ceph_options_compat(device):
     return [ 'ceph.' + opt for opt in device.split(',') ]
 
 def fs_options(opts, ceph_opts):
-    # strip out noauto and _netdev options; libfuse doesn't like it
-    strip_opts = ['defaults', 'noauto', '_netdev']
+    # - strip out noauto and _netdev options; libfuse doesn't like it
+    # - nofail option is also not recognized by libfuse.
+    #   Starting with fuse 3.2.2 the option is also ignored by mount.fuse, see
+    #   https://github.com/libfuse/libfuse/commit/a83cd72f641671b71b8268b1765e449cae071f3e
+    strip_opts = ['defaults', 'noauto', '_netdev', 'nofail']
     return ','.join(list(set(opts) - set(ceph_opts) - set(strip_opts)))
 
 def main(arguments):