X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6a0610e67965f2ba9ff9df2df36d92d3fa2450a2..9756d91f6f1e2472184be0dc45e8849c2c9ab35b:/services/fuse/bin/arv-mount diff --git a/services/fuse/bin/arv-mount b/services/fuse/bin/arv-mount index 00cfbdecb4..5b161fd2be 100755 --- a/services/fuse/bin/arv-mount +++ b/services/fuse/bin/arv-mount @@ -7,7 +7,9 @@ import logging import os import signal import subprocess +import time +import arvados.commands._util as arv_cmd from arvados_fuse import * logger = logging.getLogger('arvados.arv-mount') @@ -15,6 +17,7 @@ logger = logging.getLogger('arvados.arv-mount') if __name__ == '__main__': # Handle command line parameters parser = argparse.ArgumentParser( + parents=[arv_cmd.retry_opt], description='''Mount Keep data under the local filesystem. Default mode is --home''', epilog=""" Note: When using the --exec feature, you must either specify the @@ -40,6 +43,7 @@ with "--". 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('--encoding', type=str, help="Character encoding to use for filesystem, default is utf-8 (see Python codec registry for list of available encodings)", default="utf-8") parser.add_argument('--exec', type=str, nargs=argparse.REMAINDER, dest="exec_args", metavar=('command', 'args', '...', '--'), help="""Mount, run a command, then unmount and exit""") @@ -58,61 +62,67 @@ with "--". else: daemon_ctx = None - # 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) - + # Configure a log handler based on command-line switches. 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() + log_handler = None - if base_logger is None: - base_logger = logging.getLogger() - else: - base_logger.removeHandler(arvados.log_handler) - base_logger.addHandler(log_handler) + if log_handler is not None: + arvados.logger.removeHandler(arvados.log_handler) + arvados.logger.addHandler(log_handler) if args.debug: - base_logger.setLevel(logging.DEBUG) + arvados.logger.setLevel(logging.DEBUG) logger.debug("arv-mount debugging enabled") try: # Create the request handler - operations = Operations(os.getuid(), os.getgid()) + operations = Operations(os.getuid(), os.getgid(), args.encoding) api = SafeApi(arvados.config) - usr = api.users().current().execute() + usr = api.users().current().execute(num_retries=args.retries) + now = time.time() + dir_class = None + dir_args = [llfuse.ROOT_INODE, operations.inodes, api, args.retries] if args.by_id: # Set up the request handler with the 'magic directory' at the root - operations.inodes.add_entry(MagicDirectory(llfuse.ROOT_INODE, operations.inodes, api)) + dir_class = MagicDirectory elif args.by_tag: - operations.inodes.add_entry(TagsDirectory(llfuse.ROOT_INODE, operations.inodes, api)) + dir_class = TagsDirectory elif args.shared: - operations.inodes.add_entry(SharedDirectory(llfuse.ROOT_INODE, operations.inodes, api, usr)) + dir_class = SharedDirectory + dir_args.append(usr) elif args.home: - operations.inodes.add_entry(ProjectDirectory(llfuse.ROOT_INODE, operations.inodes, api, usr)) - elif args.collection != None: + dir_class = ProjectDirectory + dir_args.append(usr) + elif args.collection is not None: # Set up the request handler with the collection at the root - operations.inodes.add_entry(CollectionDirectory(llfuse.ROOT_INODE, operations.inodes, api, args.collection)) - elif args.project != None: - operations.inodes.add_entry(ProjectDirectory(llfuse.ROOT_INODE, operations.inodes, api, api.groups().get(uuid=args.project).execute())) + dir_class = CollectionDirectory + dir_args.append(args.collection) + elif args.project is not None: + dir_class = ProjectDirectory + dir_args.append(api.groups().get(uuid=args.project).execute( + num_retries=args.retries)) + + if dir_class is not None: + operations.inodes.add_entry(dir_class(*dir_args)) else: e = operations.inodes.add_entry(Directory(llfuse.ROOT_INODE)) - e._entries['home'] = operations.inodes.add_entry(ProjectDirectory(e.inode, operations.inodes, api, usr)) - e._entries['shared'] = operations.inodes.add_entry(SharedDirectory(e.inode, operations.inodes, api, usr)) - e._entries['by_tag'] = operations.inodes.add_entry(TagsDirectory(e.inode, operations.inodes, api)) - e._entries['by_id'] = operations.inodes.add_entry(MagicDirectory(e.inode, operations.inodes, api)) + dir_args[0] = e.inode + + e._entries['by_id'] = operations.inodes.add_entry(MagicDirectory(*dir_args)) + e._entries['by_tag'] = operations.inodes.add_entry(TagsDirectory(*dir_args)) + + dir_args.append(usr) + e._entries['home'] = operations.inodes.add_entry(ProjectDirectory(*dir_args)) + e._entries['shared'] = operations.inodes.add_entry(SharedDirectory(*dir_args)) text = ''' -Welcome to Arvados! This directory provides file system access to files and objects -available on the Arvados installation located at '{}' +Welcome to Arvados! This directory provides file system access to files and objects +available on the Arvados installation located at '{}' using credentials for user '{}'. From here, the following directories are available: @@ -123,7 +133,7 @@ From here, the following directories are available: shared/ Projects shared with you. '''.format(arvados.config.get('ARVADOS_API_HOST'), usr['email']) - e._entries["README"] = operations.inodes.add_entry(StringFile(e.inode, text, 0, 0)) + e._entries["README"] = operations.inodes.add_entry(StringFile(e.inode, text, now)) except Exception: