X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/86ec536f01179ecc1bca0f32a4f41ad307b23c7e..2f66d4cc05e9442a9bb69969744d0750a02a1ed4:/services/fuse/arvados_fuse/command.py diff --git a/services/fuse/arvados_fuse/command.py b/services/fuse/arvados_fuse/command.py index c9a090cbcf..7bef8a269f 100644 --- a/services/fuse/arvados_fuse/command.py +++ b/services/fuse/arvados_fuse/command.py @@ -1,3 +1,10 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + +from future.utils import native_str +from builtins import range +from builtins import object import argparse import arvados import daemon @@ -13,6 +20,7 @@ import time import arvados.commands._util as arv_cmd from arvados_fuse import crunchstat from arvados_fuse import * +from arvados_fuse.unmount import unmount from arvados_fuse._version import __version__ class ArgumentParser(argparse.ArgumentParser): @@ -26,7 +34,7 @@ class ArgumentParser(argparse.ArgumentParser): with "--". """) self.add_argument('--version', action='version', - version="%s %s" % (sys.argv[0], __version__), + version=u"%s %s" % (sys.argv[0], __version__), help='Print version and exit.') self.add_argument('mountpoint', type=str, help="""Mount point.""") self.add_argument('--allow-other', action='store_true', @@ -90,10 +98,13 @@ class ArgumentParser(argparse.ArgumentParser): self.add_argument('--crunchstat-interval', type=float, help="Write stats to stderr every N seconds (default disabled)", default=0) - self.add_argument('--unmount', action='store_true', default=False, - help="Forcefully unmount the specified mountpoint (if it's a fuse mount) and exit") - self.add_argument('--replace', action='store_true', default=False, - help="Forcefully unmount any existing fuse mount before mounting") + unmount = self.add_mutually_exclusive_group() + unmount.add_argument('--unmount', action='store_true', default=False, + help="Forcefully unmount the specified mountpoint (if it's a fuse mount) and exit. If --subtype is given, unmount only if the mount has the specified subtype. WARNING: This command can affect any kind of fuse mount, not just arv-mount.") + unmount.add_argument('--unmount-all', action='store_true', default=False, + help="Forcefully unmount every fuse mount at or below the specified path and exit. If --subtype is given, unmount only mounts that have the specified subtype. Exit non-zero if any other types of mounts are found at or below the given path. WARNING: This command can affect any kind of fuse mount, not just arv-mount.") + unmount.add_argument('--replace', action='store_true', default=False, + help="If a fuse mount is already present at mountpoint, forcefully unmount it before mounting") self.add_argument('--unmount-timeout', type=float, default=2.0, help="Time to wait for graceful shutdown after --exec program exits and filesystem is unmounted") @@ -105,6 +116,7 @@ class ArgumentParser(argparse.ArgumentParser): class Mount(object): def __init__(self, args, logger=logging.getLogger('arvados.arv-mount')): + self.daemon = False self.logger = logger self.args = args self.listen_for_events = False @@ -123,8 +135,15 @@ class Mount(object): def __enter__(self): if self.args.replace: - unmount(self.args.mountpoint, timeout=self.args.unmount_timeout) - llfuse.init(self.operations, self.args.mountpoint, self._fuse_options()) + unmount(path=self.args.mountpoint, + timeout=self.args.unmount_timeout) + llfuse.init(self.operations, native_str(self.args.mountpoint), self._fuse_options()) + if self.daemon: + daemon.DaemonContext( + working_directory=os.path.dirname(self.args.mountpoint), + files_preserve=list(range( + 3, resource.getrlimit(resource.RLIMIT_NOFILE)[1])) + ).open() if self.listen_for_events and not self.args.disable_event_listening: self.operations.listen_for_events() self.llfuse_thread = threading.Thread(None, lambda: self._llfuse_main()) @@ -145,8 +164,11 @@ class Mount(object): self.args.unmount_timeout) def run(self): - if self.args.unmount: - unmount(self.args.mountpoint, timeout=self.args.unmount_timeout) + if self.args.unmount or self.args.unmount_all: + unmount(path=self.args.mountpoint, + subtype=self.args.subtype, + timeout=self.args.unmount_timeout, + recursive=self.args.unmount_all) elif self.args.exec_args: self._run_exec() else: @@ -183,15 +205,20 @@ class Mount(object): logging.getLogger('arvados.collection').setLevel(logging.DEBUG) self.logger.debug("arv-mount debugging enabled") + self.logger.info("%s %s started", sys.argv[0], __version__) self.logger.info("enable write is %s", self.args.enable_write) def _setup_api(self): - self.api = arvados.safeapi.ThreadSafeApiCache( - apiconfig=arvados.config.settings(), - keep_params={ - 'block_cache': arvados.keep.KeepBlockCache(self.args.file_cache), - 'num_retries': self.args.retries, - }) + try: + self.api = arvados.safeapi.ThreadSafeApiCache( + apiconfig=arvados.config.settings(), + keep_params={ + 'block_cache': arvados.keep.KeepBlockCache(self.args.file_cache), + 'num_retries': self.args.retries, + }) + except KeyError as e: + self.logger.error("Missing environment: %s", e) + exit(1) # Do a sanity check that we have a working arvados host + token. self.api.users().current().execute() @@ -274,7 +301,7 @@ class Mount(object): return e = self.operations.inodes.add_entry(Directory( - llfuse.ROOT_INODE, self.operations.inodes)) + llfuse.ROOT_INODE, self.operations.inodes, self.api.config)) dir_args[0] = e.inode for name in self.args.mount_by_id: @@ -346,20 +373,9 @@ From here, the following directories are available: def _run_standalone(self): try: - llfuse.init(self.operations, self.args.mountpoint, self._fuse_options()) - - if not self.args.foreground: - self.daemon_ctx = daemon.DaemonContext( - working_directory=os.path.dirname(self.args.mountpoint), - files_preserve=range( - 3, resource.getrlimit(resource.RLIMIT_NOFILE)[1])) - self.daemon_ctx.open() - - # Subscribe to change events from API server - if self.listen_for_events and not self.args.disable_event_listening: - self.operations.listen_for_events() - - self._llfuse_main() + self.daemon = not self.args.foreground + with self: + self.llfuse_thread.join(timeout=None) except Exception as e: self.logger.exception('arv-mount: exception during mount: %s', e) exit(getattr(e, 'errno', 1))