X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9f4fd542a9fc94e9f48387e90fd70b614458c1f2..8dedd02357a95a0ae2c7961c8f1d0896b6311b3b:/services/fuse/tests/mount_test_base.py diff --git a/services/fuse/tests/mount_test_base.py b/services/fuse/tests/mount_test_base.py index 5379aa79dc..6e49390524 100644 --- a/services/fuse/tests/mount_test_base.py +++ b/services/fuse/tests/mount_test_base.py @@ -2,15 +2,14 @@ # # SPDX-License-Identifier: AGPL-3.0 -from __future__ import absolute_import import arvados +import arvados.keep import arvados_fuse as fuse import arvados.safeapi import llfuse import logging import multiprocessing import os -from . import run_test_server import shutil import signal import subprocess @@ -20,11 +19,21 @@ import threading import time import unittest +from . import run_test_server +from .integration_test import workerPool + logger = logging.getLogger('arvados.arv-mount') -from .integration_test import workerPool +def make_block_cache(disk_cache): + if disk_cache: + disk_cache_dir = os.path.join(os.path.expanduser("~"), ".cache", "arvados", "keep") + shutil.rmtree(disk_cache_dir, ignore_errors=True) + block_cache = arvados.keep.KeepBlockCache(disk_cache=disk_cache) + return block_cache class MountTestBase(unittest.TestCase): + disk_cache = False + def setUp(self, api=None, local_store=True): # The underlying C implementation of open() makes a fstat() syscall # with the GIL still held. When the GETATTR message comes back to @@ -43,7 +52,12 @@ class MountTestBase(unittest.TestCase): self.mounttmp = tempfile.mkdtemp() run_test_server.run() run_test_server.authorize_with("admin") - self.api = api if api else arvados.safeapi.ThreadSafeApiCache(arvados.config.settings()) + + self.api = api if api else arvados.safeapi.ThreadSafeApiCache( + arvados.config.settings(), + keep_params={"block_cache": make_block_cache(self.disk_cache)}, + version='v1', + ) self.llfuse_thread = None # This is a copy of Mount's method. TODO: Refactor MountTestBase @@ -57,12 +71,22 @@ class MountTestBase(unittest.TestCase): llfuse.close() def make_mount(self, root_class, **root_kwargs): + enable_write = root_kwargs.pop('enable_write', True) self.operations = fuse.Operations( - os.getuid(), os.getgid(), + os.getuid(), + os.getgid(), api_client=self.api, - enable_write=True) + enable_write=enable_write, + ) self.operations.inodes.add_entry(root_class( - llfuse.ROOT_INODE, self.operations.inodes, self.api, 0, True, **root_kwargs)) + llfuse.ROOT_INODE, + self.operations.inodes, + self.api, + 0, + enable_write, + root_kwargs.pop('filters', None), + **root_kwargs, + )) llfuse.init(self.operations, self.mounttmp, []) self.llfuse_thread = threading.Thread(None, lambda: self._llfuse_main()) self.llfuse_thread.daemon = True @@ -77,10 +101,10 @@ class MountTestBase(unittest.TestCase): self.operations.events.close(timeout=10) subprocess.call(["fusermount", "-u", "-z", self.mounttmp]) t0 = time.time() - self.llfuse_thread.join(timeout=10) + self.llfuse_thread.join(timeout=60) if self.llfuse_thread.is_alive(): logger.warning("MountTestBase.tearDown():" - " llfuse thread still alive 10s after umount" + " llfuse thread still alive 60s after umount" " -- exiting with SIGKILL") os.kill(os.getpid(), signal.SIGKILL) waited = time.time() - t0