Rewrite mount.fuse.ceph (to python) and move ceph-fuse options to fs_mntops

Rewrote mount.fuse.ceph to move ceph-fuse options to `fs_mntops`, where it should be.
Bash version with options in `fs_spec` is counterintuitive and cause issues in some
situations (systemd, for example)

Signed-off-by: Edgaras Lukosevicius <edgaras.lukosevicius@gmail.com>

diff --git a/doc/cephfs/fstab.rst b/doc/cephfs/fstab.rst
index 61270771c86f53f817a147e1d1aebe784fb35a94..e3f0446a7452005330897f84791365969c59837c 100644 (file)
--- a/doc/cephfs/fstab.rst
+++ b/doc/cephfs/fstab.rst
@@ -29,15 +29,14 @@ FUSE
 To mount Ceph FS in your file systems table as a filesystem in user space, add the
 following to ``/etc/fstab``::
 
-       #DEVICE                                  PATH         TYPE      OPTIONS
-       id={user-ID}[,conf={path/to/conf.conf}] /mount/path  fuse.ceph defaults,_netdev 0 0
+       #DEVICE PATH       TYPE      OPTIONS
+       none    /mnt/ceph  fuse.ceph ceph.id={user-ID}[,ceph.conf={path/to/conf.conf}],_netdev,defaults  0 0
 
 For example::
 
-       id=admin  /mnt/ceph  fuse.ceph defaults 0 0 
-       id=myuser,conf=/etc/ceph/cluster.conf  /mnt/ceph2  fuse.ceph defaults 0 0 
+       none    /mnt/ceph  fuse.ceph ceph.id=myuser,_netdev,defaults  0 0
+       none    /mnt/ceph  fuse.ceph ceph.id=myuser,ceph.conf=/etc/ceph/foo.conf,_netdev,defaults  0 0
 
-The ``DEVICE`` field is a comma-delimited list of options to pass to the command line.
 Ensure you use the ID (e.g., ``admin``, not ``client.admin``). You can pass any valid 
 ``ceph-fuse`` option to the command line this way.
 

diff --git a/src/mount.fuse.ceph b/src/mount.fuse.ceph
index 5290dcc379e2d1a794284dfaa9cc71eb85679373..5c65ddca01ae25d24144f659eae5182e9e155555 100755 (executable)
--- a/src/mount.fuse.ceph
+++ b/src/mount.fuse.ceph
@@ -1,41 +1,79 @@
-#!/bin/sh
-#
-# Helper to mount ceph-fuse from /etc/fstab.  To use, add an entry
-# like:
-#
-# # DEVICE                           PATH         TYPE        OPTIONS
-# id=admin                           /mnt/ceph    fuse.ceph   defaults   0 0
-# id=myuser,conf=/etc/ceph/foo.conf  /mnt/ceph2   fuse.ceph   defaults   0 0
-#
-# where the device field is a comma-separated list of options to pass on
-# the command line.  The examples above, for example, specify that
-# ceph-fuse will authenticated as client.admin and client.myuser
-# (respectively), and the second example also sets the 'conf' option to
-# '/etc/ceph/foo.conf' via the ceph-fuse command line.  Any valid
-# ceph-fuse can be passed in this way.
-
-set -e
-
-# convert device string to options
-cephargs='--'`echo $1 | sed 's/,/ --/g'`
-
-# get mount point
-mountpoint=$2
-
-shift 2
-
-while [ "$1" != "-o" ]
-do
-        shift
-done
-
-opts=$2
-
-# strip out 'noauto' option; libfuse doesn't like it
-opts=`echo $opts | sed 's/,noauto//' | sed 's/noauto,//'`
-
-# strip out '_netdev' option; libfuse doesn't like it
-opts=`echo $opts | sed 's/,_netdev//' | sed 's/_netdev,//'`
-
-# go
-exec ceph-fuse $cephargs $mountpoint -o $opts
+#!/usr/bin/env python
+'''
+Helper to mount ceph-fuse from /etc/fstab.  To use, add an entry
+like:
+
+DEVICE  PATH       TYPE        OPTIONS
+none    /mnt/ceph  fuse.ceph   ceph.id=admin,_netdev,defaults  0 0
+none    /mnt/ceph  fuse.ceph   ceph.name=client.admin,_netdev,defaults  0 0
+none    /mnt/ceph  fuse.ceph   ceph.id=myuser,ceph.conf=/etc/ceph/foo.conf,_netdev,defaults  0 0
+
+ceph-fuse options are specified in the fs_mntops(4) column and must begin
+with 'ceph.' prefix. This way ceph related fs options will be passed to
+ceph-fuse and others will be ignored by ceph-fuse.
+First two examples above, for example, speficy that ceph-fuse will authenticate
+as client.admin. Third example specify, that ceph-fuse will authenticate as
+client.myuser and also sets 'conf' option to '/etc/ceph/foo.conf' via ceph-fuse
+command line.
+Any valid ceph-fuse options can be passed this way.
+
+NOTE:
+Old format is also supported
+
+DEVICE                             PATH        TYPE        OPTIONS
+id=admin                           /mnt/ceph   fuse.ceph   defaults   0 0
+id=myuser,conf=/etc/ceph/foo.conf  /mnt/ceph   fuse.ceph   defaults   0 0
+'''
+
+import sys
+import argparse
+from subprocess import Popen
+
+def ceph_options(mntops):
+    ceph_opts = [o for o in mntops if o.startswith('ceph.')]
+    return ceph_opts
+
+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']
+    return ','.join(list(set(opts) - set(ceph_opts) - set(strip_opts)))
+
+def main(arguments):
+    parser = argparse.ArgumentParser(description=__doc__,
+                                     formatter_class=argparse.RawDescriptionHelpFormatter)
+    parser.add_argument('device', type=str, nargs='+',
+                        help='Device')
+    parser.add_argument('mountpoint', type=str, nargs='+',
+                        help='Mount point')
+    parser.add_argument('-o', dest='options', type=str, nargs='+',
+                        help='Filesystem options')
+    args = parser.parse_known_args(arguments)[0]
+
+    device = args.device[0]
+    mountpoint = args.mountpoint[0]
+    options = ''.join(args.options).split(',')
+
+    if '=' in device:
+        ceph_opts = ceph_options_compat(device)
+    else:
+        ceph_opts = ceph_options(options)
+
+    fs_opts = fs_options(options, ceph_opts)
+    ceph_opts = ' '.join(['--' + o.replace('ceph.', '', 1) for o in ceph_opts])
+
+    command = 'ceph-fuse %s %s' % (ceph_opts, mountpoint)
+
+    if fs_opts:
+        command += ' -o %s' % (fs_opts)
+
+    mount_cmd = Popen(command, shell=True)
+    mount_cmd.communicate()
+
+    if (mount_cmd.returncode != 0):
+        print("Mount failed with status code: {}".format(mount_cmd.returncode))
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv[1:]))