X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7a873b4adfd0a7f94a4e7dfa64eb088caece46df..1a0a58c4f22af82e0a37440af3b0948771bca5e1:/services/fuse/bin/arv-mount diff --git a/services/fuse/bin/arv-mount b/services/fuse/bin/arv-mount index 904fbf1b8d..794a468fbc 100755 --- a/services/fuse/bin/arv-mount +++ b/services/fuse/bin/arv-mount @@ -1,10 +1,16 @@ #!/usr/bin/env python -from arvados_fuse import * -import arvados -import subprocess import argparse +import arvados import daemon +import logging +import os +import signal +import subprocess + +from arvados_fuse import * + +logger = logging.getLogger('arvados.arv-mount') if __name__ == '__main__': # Handle command line parameters @@ -27,28 +33,69 @@ with "--". collections on the server.""") parser.add_argument('--groups', action='store_true', help="""Mount as a virtual directory consisting of subdirectories representing groups on the server.""") parser.add_argument('--debug', action='store_true', help="""Debug mode""") + parser.add_argument('--logfile', help="""Write debug logs and errors to the specified file (default stderr).""") parser.add_argument('--foreground', action='store_true', help="""Run in foreground (default is to daemonize unless --exec specified)""", default=False) parser.add_argument('--exec', type=str, nargs=argparse.REMAINDER, dest="exec_args", metavar=('command', 'args', '...', '--'), help="""Mount, run a command, then unmount and exit""") args = parser.parse_args() + args.mountpoint = os.path.realpath(args.mountpoint) + if args.logfile: + args.logfile = os.path.realpath(args.logfile) - # Create the request handler - operations = Operations(os.getuid(), os.getgid()) + # Daemonize as early as possible, so we don't accidentally close + # file descriptors we're using. + if not (args.exec_args or args.foreground): + os.chdir(args.mountpoint) + daemon_ctx = daemon.DaemonContext(working_directory='.') + daemon_ctx.open() + else: + daemon_ctx = None - if args.groups: - api = arvados.api('v1') - e = operations.inodes.add_entry(GroupsDirectory(llfuse.ROOT_INODE, operations.inodes, api)) - elif args.tags: - api = arvados.api('v1') - e = operations.inodes.add_entry(TagsDirectory(llfuse.ROOT_INODE, operations.inodes, api)) - elif args.collection != None: - # Set up the request handler with the collection at the root - e = operations.inodes.add_entry(CollectionDirectory(llfuse.ROOT_INODE, operations.inodes, args.collection)) + # Configure a logger based on command-line switches. + # If we're using a contemporary Python SDK (mid-August 2014), + # configure the arvados hierarchy logger. + # Otherwise, configure the program root logger. + base_logger = getattr(arvados, 'logger', None) + + if args.logfile: + log_handler = logging.FileHandler(args.logfile) + elif daemon_ctx: + log_handler = logging.NullHandler() + elif base_logger: + log_handler = arvados.log_handler + else: + log_handler = logging.StreamHandler() + + if base_logger is None: + base_logger = logging.getLogger() else: - # Set up the request handler with the 'magic directory' at the root - operations.inodes.add_entry(MagicDirectory(llfuse.ROOT_INODE, operations.inodes)) + base_logger.removeHandler(arvados.log_handler) + base_logger.addHandler(log_handler) + + if args.debug: + base_logger.setLevel(logging.DEBUG) + logger.debug("arv-mount debugging enabled") + + try: + # Create the request handler + operations = Operations(os.getuid(), os.getgid()) + api = arvados.api('v1') + + if args.groups: + e = operations.inodes.add_entry(GroupsDirectory(llfuse.ROOT_INODE, operations.inodes, api)) + elif args.tags: + e = operations.inodes.add_entry(TagsDirectory(llfuse.ROOT_INODE, operations.inodes, api)) + elif args.collection != None: + # Set up the request handler with the collection at the root + e = operations.inodes.add_entry(CollectionDirectory(llfuse.ROOT_INODE, operations.inodes, args.collection)) + else: + # Set up the request handler with the 'magic directory' at the root + operations.inodes.add_entry(MagicDirectory(llfuse.ROOT_INODE, operations.inodes)) + except Exception: + logger.exception("arv-mount: exception during API setup") + exit(1) # FUSE options, see mount.fuse(8) opts = [optname for optname in ['allow_other', 'debug'] @@ -66,23 +113,35 @@ collections on the server.""") rc = 255 try: - rc = subprocess.call(args.exec_args, shell=False) - except OSError as e: - sys.stderr.write('arv-mount: %s -- exec %s\n' % (str(e), args.exec_args)) - rc = e.errno + sp = subprocess.Popen(args.exec_args, shell=False) + + # forward signals to the process. + signal.signal(signal.SIGINT, lambda signum, frame: sp.send_signal(signum)) + signal.signal(signal.SIGTERM, lambda signum, frame: sp.send_signal(signum)) + signal.signal(signal.SIGQUIT, lambda signum, frame: sp.send_signal(signum)) + + # wait for process to complete. + rc = sp.wait() + + # restore default signal handlers. + signal.signal(signal.SIGINT, signal.SIG_DFL) + signal.signal(signal.SIGTERM, signal.SIG_DFL) + signal.signal(signal.SIGQUIT, signal.SIG_DFL) except Exception as e: - sys.stderr.write('arv-mount: %s\n' % str(e)) + logger.exception('arv-mount: exception during exec %s', + args.exec_args) + try: + rc = e.errno + except AttributeError: + pass finally: subprocess.call(["fusermount", "-u", "-z", args.mountpoint]) exit(rc) else: - if args.foreground: - # Initialize the fuse connection + try: llfuse.init(operations, args.mountpoint, opts) llfuse.main() - else: - # Initialize the fuse connection - llfuse.init(operations, args.mountpoint, opts) - with daemon.DaemonContext(): - llfuse.main() + except Exception as e: + logger.exception('arv-mount: exception during mount') + exit(getattr(e, 'errno', 1))