X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/befe9d43c1aae5d16708eac82a7493637439fcb8..873fcf181c037cc1e42419bfeaf5bb70c9d9e239:/services/fuse/arvados_fuse/command.py diff --git a/services/fuse/arvados_fuse/command.py b/services/fuse/arvados_fuse/command.py index 45847fde81..8004e8303f 100644 --- a/services/fuse/arvados_fuse/command.py +++ b/services/fuse/arvados_fuse/command.py @@ -2,9 +2,6 @@ # # 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 @@ -410,7 +407,7 @@ class Mount(object): if self.args.replace: unmount(path=self.args.mountpoint, timeout=self.args.unmount_timeout) - llfuse.init(self.operations, native_str(self.args.mountpoint), self._fuse_options()) + llfuse.init(self.operations, str(self.args.mountpoint), self._fuse_options()) if self.daemon: daemon.DaemonContext( working_directory=os.path.dirname(self.args.mountpoint), @@ -490,13 +487,6 @@ class Mount(object): disk_cache=self.args.disk_cache, disk_cache_dir=self.args.disk_cache_dir) - # If there's too many prefetch threads and you - # max out the CPU, delivering data to the FUSE - # layer actually ends up being slower. - # Experimentally, capping 7 threads seems to - # be a sweet spot. - prefetch_threads = min(max((block_cache.cache_max // (64 * 1024 * 1024)) - 1, 1), 7) - self.api = arvados.safeapi.ThreadSafeApiCache( apiconfig=arvados.config.settings(), api_params={ @@ -504,7 +494,6 @@ class Mount(object): }, keep_params={ 'block_cache': block_cache, - 'num_prefetch_threads': prefetch_threads, 'num_retries': self.args.retries, }, version='v1',