X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0b8673b62cd9717fcf7e3bbb608ae07018093d6f..23fd7cf1e89ef8c06994b7f6877be3f35faf6f1f:/services/fuse/arvados_fuse/command.py diff --git a/services/fuse/arvados_fuse/command.py b/services/fuse/arvados_fuse/command.py index ef3e78e870..67a2aaa4da 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 @@ -27,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', @@ -88,6 +95,7 @@ class ArgumentParser(argparse.ArgumentParser): self.add_argument('--read-only', action='store_false', help="Mount will be read only (default)", dest="enable_write", default=False) self.add_argument('--read-write', action='store_true', help="Mount will be read-write", dest="enable_write", default=False) + self.add_argument('--storage-classes', type=str, metavar='CLASSES', help="Specify comma separated list of storage classes to be used when saving data of new collections", default=None) self.add_argument('--crunchstat-interval', type=float, help="Write stats to stderr every N seconds (default disabled)", default=0) @@ -130,12 +138,12 @@ class Mount(object): if self.args.replace: unmount(path=self.args.mountpoint, timeout=self.args.unmount_timeout) - llfuse.init(self.operations, self.args.mountpoint, self._fuse_options()) + 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=range( - 3, resource.getrlimit(resource.RLIMIT_NOFILE)[1]) + 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() @@ -198,15 +206,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() @@ -234,6 +247,11 @@ class Mount(object): dir_args = [llfuse.ROOT_INODE, self.operations.inodes, self.api, self.args.retries] mount_readme = False + storage_classes = None + if self.args.storage_classes is not None: + storage_classes = self.args.storage_classes.replace(' ', '').split(',') + self.logger.info("Storage classes requested for new collections: {}".format(', '.join(storage_classes))) + if self.args.collection is not None: # Set up the request handler with the collection at the root # First check that the collection is readable @@ -283,27 +301,30 @@ class Mount(object): mount_readme = True if dir_class is not None: - ent = dir_class(*dir_args) + if dir_class in [TagsDirectory, CollectionDirectory]: + ent = dir_class(*dir_args) + else: + ent = dir_class(*dir_args, storage_classes=storage_classes) self.operations.inodes.add_entry(ent) self.listen_for_events = ent.want_event_subscribe() 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: - self._add_mount(e, name, MagicDirectory(*dir_args, pdh_only=False)) + self._add_mount(e, name, MagicDirectory(*dir_args, pdh_only=False, storage_classes=storage_classes)) for name in self.args.mount_by_pdh: self._add_mount(e, name, MagicDirectory(*dir_args, pdh_only=True)) for name in self.args.mount_by_tag: self._add_mount(e, name, TagsDirectory(*dir_args)) for name in self.args.mount_home: - self._add_mount(e, name, ProjectDirectory(*dir_args, project_object=usr, poll=True)) + self._add_mount(e, name, ProjectDirectory(*dir_args, project_object=usr, poll=True, storage_classes=storage_classes)) for name in self.args.mount_shared: - self._add_mount(e, name, SharedDirectory(*dir_args, exclude=usr, poll=True)) + self._add_mount(e, name, SharedDirectory(*dir_args, exclude=usr, poll=True, storage_classes=storage_classes)) for name in self.args.mount_tmp: - self._add_mount(e, name, TmpCollectionDirectory(*dir_args)) + self._add_mount(e, name, TmpCollectionDirectory(*dir_args, storage_classes=storage_classes)) if mount_readme: text = self._readme_text(