X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b071451144bb00134cb31c868aae640fee4eca24..ba34a22d9918ae97306472c04701e69090821c82:/services/fuse/tests/test_mount.py diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py index 1b9d361bfb..df3d426341 100644 --- a/services/fuse/tests/test_mount.py +++ b/services/fuse/tests/test_mount.py @@ -6,6 +6,7 @@ from __future__ import absolute_import from future.utils import viewitems from builtins import str from builtins import object +from six import assertRegex import json import llfuse import logging @@ -14,12 +15,16 @@ import os import subprocess import time import unittest +import tempfile +import parameterized import arvados import arvados_fuse as fuse from . import run_test_server +from .integration_test import IntegrationTest from .mount_test_base import MountTestBase +from .test_tmp_collection import storage_classes_desired logger = logging.getLogger('arvados.arv-mount') @@ -50,7 +55,7 @@ class AssertWithTimeout(object): else: self.done = True - +@parameterized.parameterized_class([{"disk_cache": True}, {"disk_cache": False}]) class FuseMountTest(MountTestBase): def setUp(self): super(FuseMountTest, self).setUp() @@ -121,13 +126,16 @@ class FuseMountTest(MountTestBase): self.assertEqual(v, f.read().decode()) +@parameterized.parameterized_class([{"disk_cache": True}, {"disk_cache": False}]) class FuseMagicTest(MountTestBase): def setUp(self, api=None): super(FuseMagicTest, self).setUp(api=api) self.test_project = run_test_server.fixture('groups')['aproject']['uuid'] - self.non_project_group = run_test_server.fixture('groups')['public']['uuid'] + self.non_project_group = run_test_server.fixture('groups')['public_role']['uuid'] + self.filter_group = run_test_server.fixture('groups')['afiltergroup']['uuid'] self.collection_in_test_project = run_test_server.fixture('collections')['foo_collection_in_aproject']['name'] + self.collection_in_filter_group = run_test_server.fixture('collections')['baz_file']['name'] cw = arvados.CollectionWriter() @@ -155,6 +163,11 @@ class FuseMagicTest(MountTestBase): llfuse.listdir(os.path.join(self.mounttmp, self.test_project))) self.assertIn(self.collection_in_test_project, llfuse.listdir(os.path.join(self.mounttmp, 'by_id', self.test_project))) + self.assertIn(self.collection_in_filter_group, + llfuse.listdir(os.path.join(self.mounttmp, self.filter_group))) + self.assertIn(self.collection_in_filter_group, + llfuse.listdir(os.path.join(self.mounttmp, 'by_id', self.filter_group))) + mount_ls = llfuse.listdir(self.mounttmp) self.assertIn('README', mount_ls) @@ -164,6 +177,8 @@ class FuseMagicTest(MountTestBase): self.assertIn(self.test_project, mount_ls) self.assertIn(self.test_project, llfuse.listdir(os.path.join(self.mounttmp, 'by_id'))) + self.assertIn(self.filter_group, + llfuse.listdir(os.path.join(self.mounttmp, 'by_id'))) with self.assertRaises(OSError): llfuse.listdir(os.path.join(self.mounttmp, 'by_id', self.non_project_group)) @@ -270,12 +285,13 @@ def fuseSharedTestHelper(mounttmp): Test().runTest() +@parameterized.parameterized_class([{"disk_cache": True}, {"disk_cache": False}]) class FuseSharedTest(MountTestBase): def runTest(self): self.make_mount(fuse.SharedDirectory, exclude=self.api.users().current().execute()['uuid']) keep = arvados.keep.KeepClient() - keep.put("baz") + keep.put("baz".encode()) self.pool.apply(fuseSharedTestHelper, (self.mounttmp,)) @@ -330,6 +346,7 @@ def fuseModifyFileTestHelperReadEndContents(mounttmp): self.assertEqual("plnp", f.read()) Test().runTest() +@parameterized.parameterized_class([{"disk_cache": True}, {"disk_cache": False}]) class FuseModifyFileTest(MountTestBase): def runTest(self): collection = arvados.collection.Collection(api_client=self.api) @@ -350,6 +367,7 @@ class FuseModifyFileTest(MountTestBase): self.pool.apply(fuseModifyFileTestHelperReadEndContents, (self.mounttmp,)) +@parameterized.parameterized_class([{"disk_cache": True}, {"disk_cache": False}]) class FuseAddFileToCollectionTest(MountTestBase): def runTest(self): collection = arvados.collection.Collection(api_client=self.api) @@ -372,6 +390,7 @@ class FuseAddFileToCollectionTest(MountTestBase): self.assertEqual(["file1.txt", "file2.txt"], sorted(d1)) +@parameterized.parameterized_class([{"disk_cache": True}, {"disk_cache": False}]) class FuseRemoveFileFromCollectionTest(MountTestBase): def runTest(self): collection = arvados.collection.Collection(api_client=self.api) @@ -403,6 +422,7 @@ def fuseCreateFileTestHelper(mounttmp): pass Test().runTest() +@parameterized.parameterized_class([{"disk_cache": True}, {"disk_cache": False}]) class FuseCreateFileTest(MountTestBase): def runTest(self): collection = arvados.collection.Collection(api_client=self.api) @@ -428,7 +448,7 @@ class FuseCreateFileTest(MountTestBase): self.assertEqual(["file1.txt"], d1) collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() - self.assertRegexpMatches(collection2["manifest_text"], + assertRegex(self, collection2["manifest_text"], r'\. d41d8cd98f00b204e9800998ecf8427e\+0\+A\S+ 0:0:file1\.txt$') @@ -446,6 +466,7 @@ def fuseWriteFileTestHelperReadFile(mounttmp): self.assertEqual(f.read(), "Hello world!") Test().runTest() +@parameterized.parameterized_class([{"disk_cache": True}, {"disk_cache": False}]) class FuseWriteFileTest(MountTestBase): def runTest(self): collection = arvados.collection.Collection(api_client=self.api) @@ -470,7 +491,7 @@ class FuseWriteFileTest(MountTestBase): self.assertEqual(12, self.operations.read_counter.get()) collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() - self.assertRegexpMatches(collection2["manifest_text"], + assertRegex(self, collection2["manifest_text"], r'\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$') @@ -494,6 +515,7 @@ def fuseUpdateFileTestHelper(mounttmp): Test().runTest() +@parameterized.parameterized_class([{"disk_cache": True}, {"disk_cache": False}]) class FuseUpdateFileTest(MountTestBase): def runTest(self): collection = arvados.collection.Collection(api_client=self.api) @@ -508,7 +530,7 @@ class FuseUpdateFileTest(MountTestBase): self.pool.apply(fuseUpdateFileTestHelper, (self.mounttmp,)) collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() - self.assertRegexpMatches(collection2["manifest_text"], + assertRegex(self, collection2["manifest_text"], r'\. daaef200ebb921e011e3ae922dd3266b\+11\+A\S+ 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:11:file1\.txt 22:1:file1\.txt$') @@ -548,7 +570,7 @@ class FuseMkdirTest(MountTestBase): self.pool.apply(fuseMkdirTestHelper, (self.mounttmp,)) collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() - self.assertRegexpMatches(collection2["manifest_text"], + assertRegex(self, collection2["manifest_text"], r'\./testdir 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$') @@ -615,13 +637,13 @@ class FuseRmTest(MountTestBase): # Starting manifest collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() - self.assertRegexpMatches(collection2["manifest_text"], + assertRegex(self, collection2["manifest_text"], r'\./testdir 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$') self.pool.apply(fuseRmTestHelperDeleteFile, (self.mounttmp,)) # Empty directories are represented by an empty file named "." collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() - self.assertRegexpMatches(collection2["manifest_text"], + assertRegex(self, collection2["manifest_text"], r'./testdir d41d8cd98f00b204e9800998ecf8427e\+0\+A\S+ 0:0:\\056\n') self.pool.apply(fuseRmTestHelperRmdir, (self.mounttmp,)) @@ -672,13 +694,13 @@ class FuseMvFileTest(MountTestBase): # Starting manifest collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() - self.assertRegexpMatches(collection2["manifest_text"], + assertRegex(self, collection2["manifest_text"], r'\./testdir 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$') self.pool.apply(fuseMvFileTestHelperMoveFile, (self.mounttmp,)) collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() - self.assertRegexpMatches(collection2["manifest_text"], + assertRegex(self, collection2["manifest_text"], r'\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt\n\./testdir d41d8cd98f00b204e9800998ecf8427e\+0\+A\S+ 0:0:\\056\n') @@ -706,7 +728,7 @@ class FuseRenameTest(MountTestBase): # Starting manifest collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() - self.assertRegexpMatches(collection2["manifest_text"], + assertRegex(self, collection2["manifest_text"], r'\./testdir 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$') d1 = llfuse.listdir(os.path.join(self.mounttmp)) @@ -722,7 +744,7 @@ class FuseRenameTest(MountTestBase): self.assertEqual(["file1.txt"], d1) collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() - self.assertRegexpMatches(collection2["manifest_text"], + assertRegex(self, collection2["manifest_text"], r'\./testdir2 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$') @@ -776,10 +798,15 @@ class FuseDeleteProjectEventTest(MountTestBase): attempt(self.assertEqual, [], llfuse.listdir(os.path.join(self.mounttmp, "aproject"))) -def fuseFileConflictTestHelper(mounttmp): +def fuseFileConflictTestHelper(mounttmp, uuid, keeptmp, settings): class Test(unittest.TestCase): def runTest(self): + os.environ['KEEP_LOCAL_STORE'] = keeptmp + with open(os.path.join(mounttmp, "file1.txt"), "w") as f: + with arvados.collection.Collection(uuid, api_client=arvados.api_from_config('v1', apiconfig=settings)) as collection2: + with collection2.open("file1.txt", "w") as f2: + f2.write("foo") f.write("bar") d1 = sorted(llfuse.listdir(os.path.join(mounttmp))) @@ -788,7 +815,7 @@ def fuseFileConflictTestHelper(mounttmp): with open(os.path.join(mounttmp, "file1.txt"), "r") as f: self.assertEqual(f.read(), "bar") - self.assertRegexpMatches(d1[1], + assertRegex(self, d1[1], r'file1\.txt~\d\d\d\d\d\d\d\d-\d\d\d\d\d\d~conflict~') with open(os.path.join(mounttmp, d1[1]), "r") as f: @@ -808,12 +835,8 @@ class FuseFileConflictTest(MountTestBase): d1 = llfuse.listdir(os.path.join(self.mounttmp)) self.assertEqual([], sorted(d1)) - with arvados.collection.Collection(collection.manifest_locator(), api_client=self.api) as collection2: - with collection2.open("file1.txt", "w") as f: - f.write("foo") - # See note in MountTestBase.setUp - self.pool.apply(fuseFileConflictTestHelper, (self.mounttmp,)) + self.pool.apply(fuseFileConflictTestHelper, (self.mounttmp, collection.manifest_locator(), self.keeptmp, arvados.config.settings())) def fuseUnlinkOpenFileTest(mounttmp): @@ -897,7 +920,7 @@ class FuseMvFileBetweenCollectionsTest(MountTestBase): collection1.update() collection2.update() - self.assertRegexpMatches(collection1.manifest_text(), r"\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$") + assertRegex(self, collection1.manifest_text(), r"\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$") self.assertEqual(collection2.manifest_text(), "") self.pool.apply(fuseMvFileBetweenCollectionsTest2, (self.mounttmp, @@ -908,7 +931,7 @@ class FuseMvFileBetweenCollectionsTest(MountTestBase): collection2.update() self.assertEqual(collection1.manifest_text(), "") - self.assertRegexpMatches(collection2.manifest_text(), r"\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file2\.txt$") + assertRegex(self, collection2.manifest_text(), r"\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file2\.txt$") collection1.stop_threads() collection2.stop_threads() @@ -968,7 +991,7 @@ class FuseMvDirBetweenCollectionsTest(MountTestBase): collection1.update() collection2.update() - self.assertRegexpMatches(collection1.manifest_text(), r"\./testdir 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$") + assertRegex(self, collection1.manifest_text(), r"\./testdir 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$") self.assertEqual(collection2.manifest_text(), "") self.pool.apply(fuseMvDirBetweenCollectionsTest2, (self.mounttmp, @@ -979,7 +1002,7 @@ class FuseMvDirBetweenCollectionsTest(MountTestBase): collection2.update() self.assertEqual(collection1.manifest_text(), "") - self.assertRegexpMatches(collection2.manifest_text(), r"\./testdir2 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$") + assertRegex(self, collection2.manifest_text(), r"\./testdir2 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$") collection1.stop_threads() collection2.stop_threads() @@ -1074,6 +1097,7 @@ class FuseFsyncTest(FuseMagicTest): class MagicDirApiError(FuseMagicTest): def setUp(self): api = mock.MagicMock() + api.keep.block_cache = mock.MagicMock(cache_max=1) super(MagicDirApiError, self).setUp(api=api) api.collections().get().execute.side_effect = iter([ Exception('API fail'), @@ -1085,19 +1109,21 @@ class MagicDirApiError(FuseMagicTest): api.keep.get.side_effect = Exception('Keep fail') def runTest(self): - self.make_mount(fuse.MagicDirectory) + with mock.patch('arvados_fuse.fresh.FreshBase._poll_time', new_callable=mock.PropertyMock, return_value=60) as mock_poll_time: + self.make_mount(fuse.MagicDirectory) - self.operations.inodes.inode_cache.cap = 1 - self.operations.inodes.inode_cache.min_entries = 2 + self.operations.inodes.inode_cache.cap = 1 + self.operations.inodes.inode_cache.min_entries = 2 - with self.assertRaises(OSError): - llfuse.listdir(os.path.join(self.mounttmp, self.testcollection)) + with self.assertRaises(OSError): + llfuse.listdir(os.path.join(self.mounttmp, self.testcollection)) - llfuse.listdir(os.path.join(self.mounttmp, self.testcollection)) + llfuse.listdir(os.path.join(self.mounttmp, self.testcollection)) -class FuseUnitTest(unittest.TestCase): +class SanitizeFilenameTest(MountTestBase): def test_sanitize_filename(self): + pdir = fuse.ProjectDirectory(1, {}, self.api, 0, False, project_object=self.api.users().current().execute()) acceptable = [ "foo.txt", ".foo", @@ -1117,15 +1143,15 @@ class FuseUnitTest(unittest.TestCase): "//", ] for f in acceptable: - self.assertEqual(f, fuse.sanitize_filename(f)) + self.assertEqual(f, pdir.sanitize_filename(f)) for f in unacceptable: - self.assertNotEqual(f, fuse.sanitize_filename(f)) + self.assertNotEqual(f, pdir.sanitize_filename(f)) # The sanitized filename should be the same length, though. - self.assertEqual(len(f), len(fuse.sanitize_filename(f))) + self.assertEqual(len(f), len(pdir.sanitize_filename(f))) # Special cases - self.assertEqual("_", fuse.sanitize_filename("")) - self.assertEqual("_", fuse.sanitize_filename(".")) - self.assertEqual("__", fuse.sanitize_filename("..")) + self.assertEqual("_", pdir.sanitize_filename("")) + self.assertEqual("_", pdir.sanitize_filename(".")) + self.assertEqual("__", pdir.sanitize_filename("..")) class FuseMagicTestPDHOnly(MountTestBase): @@ -1166,11 +1192,11 @@ class FuseMagicTestPDHOnly(MountTestBase): llfuse.listdir(os.path.join(self.mounttmp, 'by_id'))) files = {} - files[os.path.join(self.mounttmp, self.testcollection, 'thing1.txt')] = b'data 1' + files[os.path.join(self.mounttmp, self.testcollection, 'thing1.txt')] = 'data 1' for k, v in viewitems(files): with open(os.path.join(self.mounttmp, k), 'rb') as f: - self.assertEqual(v, f.read()) + self.assertEqual(v, f.read().decode()) # look up using uuid should fail when pdh_only is set if pdh_only is True: @@ -1189,3 +1215,113 @@ class FuseMagicTestPDHOnly(MountTestBase): def test_with_default_by_id(self): self.verify_pdh_only(skip_pdh_only=True) + + +class SlashSubstitutionTest(IntegrationTest): + mnt_args = [ + '--read-write', + '--mount-home', 'zzz', + ] + + def setUp(self): + super(SlashSubstitutionTest, self).setUp() + self.api = arvados.safeapi.ThreadSafeApiCache(arvados.config.settings()) + self.api.config = lambda: {"Collections": {"ForwardSlashNameSubstitution": "[SLASH]"}} + self.testcoll = self.api.collections().create(body={"name": "foo/bar/baz"}).execute() + self.testcolleasy = self.api.collections().create(body={"name": "foo-bar-baz"}).execute() + self.fusename = 'foo[SLASH]bar[SLASH]baz' + + @IntegrationTest.mount(argv=mnt_args) + @mock.patch('arvados.util.get_config_once') + def test_slash_substitution_before_listing(self, get_config_once): + get_config_once.return_value = {"Collections": {"ForwardSlashNameSubstitution": "[SLASH]"}} + self.pool_test(os.path.join(self.mnt, 'zzz'), self.fusename) + self.checkContents() + @staticmethod + def _test_slash_substitution_before_listing(self, tmpdir, fusename): + with open(os.path.join(tmpdir, 'foo-bar-baz', 'waz'), 'w') as f: + f.write('xxx') + with open(os.path.join(tmpdir, fusename, 'waz'), 'w') as f: + f.write('foo') + + @IntegrationTest.mount(argv=mnt_args) + @mock.patch('arvados.util.get_config_once') + def test_slash_substitution_after_listing(self, get_config_once): + get_config_once.return_value = {"Collections": {"ForwardSlashNameSubstitution": "[SLASH]"}} + self.pool_test(os.path.join(self.mnt, 'zzz'), self.fusename) + self.checkContents() + @staticmethod + def _test_slash_substitution_after_listing(self, tmpdir, fusename): + with open(os.path.join(tmpdir, 'foo-bar-baz', 'waz'), 'w') as f: + f.write('xxx') + os.listdir(tmpdir) + with open(os.path.join(tmpdir, fusename, 'waz'), 'w') as f: + f.write('foo') + + def checkContents(self): + self.assertRegexpMatches(self.api.collections().get(uuid=self.testcoll['uuid']).execute()['manifest_text'], ' acbd18db') # md5(foo) + self.assertRegexpMatches(self.api.collections().get(uuid=self.testcolleasy['uuid']).execute()['manifest_text'], ' f561aaf6') # md5(xxx) + + @IntegrationTest.mount(argv=mnt_args) + @mock.patch('arvados.util.get_config_once') + def test_slash_substitution_conflict(self, get_config_once): + self.testcollconflict = self.api.collections().create(body={"name": self.fusename}).execute() + get_config_once.return_value = {"Collections": {"ForwardSlashNameSubstitution": "[SLASH]"}} + self.pool_test(os.path.join(self.mnt, 'zzz'), self.fusename) + self.assertRegexpMatches(self.api.collections().get(uuid=self.testcollconflict['uuid']).execute()['manifest_text'], ' acbd18db') # md5(foo) + # foo/bar/baz collection unchanged, because it is masked by foo[SLASH]bar[SLASH]baz + self.assertEqual(self.api.collections().get(uuid=self.testcoll['uuid']).execute()['manifest_text'], '') + @staticmethod + def _test_slash_substitution_conflict(self, tmpdir, fusename): + with open(os.path.join(tmpdir, fusename, 'waz'), 'w') as f: + f.write('foo') + +class StorageClassesTest(IntegrationTest): + mnt_args = [ + '--read-write', + '--mount-home', 'homedir', + ] + + def setUp(self): + super(StorageClassesTest, self).setUp() + self.api = arvados.safeapi.ThreadSafeApiCache(arvados.config.settings()) + + @IntegrationTest.mount(argv=mnt_args) + def test_collection_default_storage_classes(self): + coll_path = os.path.join(self.mnt, 'homedir', 'a_collection') + self.api.collections().create(body={'name':'a_collection'}).execute() + self.pool_test(coll_path) + @staticmethod + def _test_collection_default_storage_classes(self, coll): + self.assertEqual(storage_classes_desired(coll), ['default']) + + @IntegrationTest.mount(argv=mnt_args+['--storage-classes', 'foo']) + def test_collection_custom_storage_classes(self): + coll_path = os.path.join(self.mnt, 'homedir', 'new_coll') + os.mkdir(coll_path) + self.pool_test(coll_path) + @staticmethod + def _test_collection_custom_storage_classes(self, coll): + self.assertEqual(storage_classes_desired(coll), ['foo']) + +def _readonlyCollectionTestHelper(mounttmp): + f = open(os.path.join(mounttmp, 'thing1.txt'), 'rt') + # Testing that close() doesn't raise an error. + f.close() + +class ReadonlyCollectionTest(MountTestBase): + def setUp(self): + super(ReadonlyCollectionTest, self).setUp() + cw = arvados.collection.Collection() + with cw.open('thing1.txt', 'wt') as f: + f.write("data 1") + cw.save_new(owner_uuid=run_test_server.fixture("groups")["aproject"]["uuid"]) + self.testcollection = cw.api_response() + + def runTest(self): + settings = arvados.config.settings().copy() + settings["ARVADOS_API_TOKEN"] = run_test_server.fixture("api_client_authorizations")["project_viewer"]["api_token"] + self.api = arvados.safeapi.ThreadSafeApiCache(settings) + self.make_mount(fuse.CollectionDirectory, collection_record=self.testcollection, enable_write=False) + + self.pool.apply(_readonlyCollectionTestHelper, (self.mounttmp,))