X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/296e1b20ecf2c283508712332f163c06464b3b5d..386e1eefaac2021805f73732b10e9f543c221593:/services/fuse/tests/test_mount.py diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py index 9a17957767..ec8868af7d 100644 --- a/services/fuse/tests/test_mount.py +++ b/services/fuse/tests/test_mount.py @@ -1,61 +1,50 @@ -import arvados -import arvados.safeapi -import arvados_fuse as fuse -import glob +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + import json import llfuse +import logging +import mock import os -import shutil import subprocess -import sys -import tempfile -import threading import time import unittest -import logging -import multiprocessing + +import arvados +import arvados_fuse as fuse import run_test_server +from mount_test_base import MountTestBase + logger = logging.getLogger('arvados.arv-mount') -class MountTestBase(unittest.TestCase): - def setUp(self): - self.keeptmp = tempfile.mkdtemp() - os.environ['KEEP_LOCAL_STORE'] = self.keeptmp - self.mounttmp = tempfile.mkdtemp() - run_test_server.run() - run_test_server.authorize_with("admin") - self.api = arvados.safeapi.ThreadSafeApiCache(arvados.config.settings()) - - def make_mount(self, root_class, **root_kwargs): - self.operations = fuse.Operations(os.getuid(), os.getgid(), inode_cache=2) - self.operations.inodes.add_entry(root_class( - llfuse.ROOT_INODE, self.operations.inodes, self.api, 0, **root_kwargs)) - llfuse.init(self.operations, self.mounttmp, ['debug']) - threading.Thread(None, llfuse.main).start() - # wait until the driver is finished initializing - self.operations.initlock.wait() - return self.operations.inodes[llfuse.ROOT_INODE] - - def tearDown(self): - # llfuse.close is buggy, so use fusermount instead. - #llfuse.close(unmount=True) - count = 0 - success = 1 - while (count < 9 and success != 0): - success = subprocess.call(["fusermount", "-u", self.mounttmp]) - time.sleep(0.5) - count += 1 - - os.rmdir(self.mounttmp) - shutil.rmtree(self.keeptmp) - run_test_server.reset() - - def assertDirContents(self, subdir, expect_content): - path = self.mounttmp - if subdir: - path = os.path.join(path, subdir) - self.assertEqual(sorted(expect_content), sorted(llfuse.listdir(path))) + +class AssertWithTimeout(object): + """Allow some time for an assertion to pass.""" + + def __init__(self, timeout=0): + self.timeout = timeout + + def __iter__(self): + self.deadline = time.time() + self.timeout + self.done = False + return self + + def next(self): + if self.done: + raise StopIteration + return self.attempt + + def attempt(self, fn, *args, **kwargs): + try: + fn(*args, **kwargs) + except AssertionError: + if time.time() > self.deadline: + raise + time.sleep(0.1) + else: + self.done = True class FuseMountTest(MountTestBase): @@ -68,8 +57,8 @@ class FuseMountTest(MountTestBase): cw.write("data 1") cw.start_new_file('thing2.txt') cw.write("data 2") - cw.start_new_stream('dir1') + cw.start_new_stream('dir1') cw.start_new_file('thing3.txt') cw.write("data 3") cw.start_new_file('thing4.txt') @@ -89,11 +78,11 @@ class FuseMountTest(MountTestBase): cw.write("data 8") cw.start_new_stream('edgecases') - for f in ":/./../.../-/*/\x01\\/ ".split("/"): + for f in ":/.../-/*/\x01\\/ ".split("/"): cw.start_new_file(f) cw.write('x') - for f in ":/../.../-/*/\x01\\/ ".split("/"): + for f in ":/.../-/*/\x01\\/ ".split("/"): cw.start_new_stream('edgecases/dirs/' + f) cw.start_new_file('x/x') cw.write('x') @@ -110,9 +99,9 @@ class FuseMountTest(MountTestBase): self.assertDirContents('dir2', ['thing5.txt', 'thing6.txt', 'dir3']) self.assertDirContents('dir2/dir3', ['thing7.txt', 'thing8.txt']) self.assertDirContents('edgecases', - "dirs/:/_/__/.../-/*/\x01\\/ ".split("/")) + "dirs/:/.../-/*/\x01\\/ ".split("/")) self.assertDirContents('edgecases/dirs', - ":/__/.../-/*/\x01\\/ ".split("/")) + ":/.../-/*/\x01\\/ ".split("/")) files = {'thing1.txt': 'data 1', 'thing2.txt': 'data 2', @@ -147,8 +136,8 @@ class FuseNoAPITest(MountTestBase): class FuseMagicTest(MountTestBase): - def setUp(self): - super(FuseMagicTest, self).setUp() + def setUp(self, api=None): + super(FuseMagicTest, self).setUp(api=api) cw = arvados.CollectionWriter() @@ -156,7 +145,8 @@ class FuseMagicTest(MountTestBase): cw.write("data 1") self.testcollection = cw.finish() - self.api.collections().create(body={"manifest_text":cw.manifest_text()}).execute() + self.test_manifest = cw.manifest_text() + self.api.collections().create(body={"manifest_text":self.test_manifest}).execute() def runTest(self): self.make_mount(fuse.MagicDirectory) @@ -216,72 +206,76 @@ class FuseTagsUpdateTest(MountTestBase): bar_uuid = run_test_server.fixture('collections')['bar_file']['uuid'] self.tag_collection(bar_uuid, 'fuse_test_tag') - time.sleep(1) - self.assertIn('fuse_test_tag', llfuse.listdir(self.mounttmp)) + for attempt in AssertWithTimeout(10): + attempt(self.assertIn, 'fuse_test_tag', llfuse.listdir(self.mounttmp)) self.assertDirContents('fuse_test_tag', [bar_uuid]) baz_uuid = run_test_server.fixture('collections')['baz_file']['uuid'] l = self.tag_collection(baz_uuid, 'fuse_test_tag') - time.sleep(1) - self.assertDirContents('fuse_test_tag', [bar_uuid, baz_uuid]) + for attempt in AssertWithTimeout(10): + attempt(self.assertDirContents, 'fuse_test_tag', [bar_uuid, baz_uuid]) self.api.links().delete(uuid=l['uuid']).execute() - time.sleep(1) - self.assertDirContents('fuse_test_tag', [bar_uuid]) + for attempt in AssertWithTimeout(10): + attempt(self.assertDirContents, 'fuse_test_tag', [bar_uuid]) + +def fuseSharedTestHelper(mounttmp): + class Test(unittest.TestCase): + def runTest(self): + # Double check that we can open and read objects in this folder as a file, + # and that its contents are what we expect. + baz_path = os.path.join( + mounttmp, + 'FUSE User', + 'FUSE Test Project', + 'collection in FUSE project', + 'baz') + with open(baz_path) as f: + self.assertEqual("baz", f.read()) + + # check mtime on collection + st = os.stat(baz_path) + try: + mtime = st.st_mtime_ns / 1000000000 + except AttributeError: + mtime = st.st_mtime + self.assertEqual(mtime, 1391448174) + + # shared_dirs is a list of the directories exposed + # by fuse.SharedDirectory (i.e. any object visible + # to the current user) + shared_dirs = llfuse.listdir(mounttmp) + shared_dirs.sort() + self.assertIn('FUSE User', shared_dirs) + + # fuse_user_objs is a list of the objects owned by the FUSE + # test user (which present as files in the 'FUSE User' + # directory) + fuse_user_objs = llfuse.listdir(os.path.join(mounttmp, 'FUSE User')) + fuse_user_objs.sort() + self.assertEqual(['FUSE Test Project', # project owned by user + 'collection #1 owned by FUSE', # collection owned by user + 'collection #2 owned by FUSE' # collection owned by user + ], fuse_user_objs) + + # test_proj_files is a list of the files in the FUSE Test Project. + test_proj_files = llfuse.listdir(os.path.join(mounttmp, 'FUSE User', 'FUSE Test Project')) + test_proj_files.sort() + self.assertEqual(['collection in FUSE project' + ], test_proj_files) + + + Test().runTest() 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") - # shared_dirs is a list of the directories exposed - # by fuse.SharedDirectory (i.e. any object visible - # to the current user) - shared_dirs = llfuse.listdir(self.mounttmp) - shared_dirs.sort() - self.assertIn('FUSE User', shared_dirs) - - # fuse_user_objs is a list of the objects owned by the FUSE - # test user (which present as files in the 'FUSE User' - # directory) - fuse_user_objs = llfuse.listdir(os.path.join(self.mounttmp, 'FUSE User')) - fuse_user_objs.sort() - self.assertEqual(['FUSE Test Project', # project owned by user - 'collection #1 owned by FUSE', # collection owned by user - 'collection #2 owned by FUSE', # collection owned by user - 'pipeline instance owned by FUSE.pipelineInstance', # pipeline instance owned by user - ], fuse_user_objs) - - # test_proj_files is a list of the files in the FUSE Test Project. - test_proj_files = llfuse.listdir(os.path.join(self.mounttmp, 'FUSE User', 'FUSE Test Project')) - test_proj_files.sort() - self.assertEqual(['collection in FUSE project', - 'pipeline instance in FUSE project.pipelineInstance', - 'pipeline template in FUSE project.pipelineTemplate' - ], test_proj_files) - - # Double check that we can open and read objects in this folder as a file, - # and that its contents are what we expect. - pipeline_template_path = os.path.join( - self.mounttmp, - 'FUSE User', - 'FUSE Test Project', - 'pipeline template in FUSE project.pipelineTemplate') - with open(pipeline_template_path) as f: - j = json.load(f) - self.assertEqual("pipeline template in FUSE project", j['name']) - - # check mtime on template - st = os.stat(pipeline_template_path) - self.assertEqual(st.st_mtime, 1397493304) - - # check mtime on collection - st = os.stat(os.path.join( - self.mounttmp, - 'FUSE User', - 'collection #1 owned by FUSE')) - self.assertEqual(st.st_mtime, 1391448174) + self.pool.apply(fuseSharedTestHelper, (self.mounttmp,)) class FuseHomeTest(MountTestBase): @@ -315,7 +309,26 @@ class FuseHomeTest(MountTestBase): d3 = llfuse.listdir(os.path.join(self.mounttmp, 'Unrestricted public data', 'GNU General Public License, version 3')) self.assertEqual(["GNU_General_Public_License,_version_3.pdf"], d3) -class FuseUpdateFileTest(MountTestBase): + +def fuseModifyFileTestHelperReadStartContents(mounttmp): + class Test(unittest.TestCase): + def runTest(self): + d1 = llfuse.listdir(mounttmp) + self.assertEqual(["file1.txt"], d1) + with open(os.path.join(mounttmp, "file1.txt")) as f: + self.assertEqual("blub", f.read()) + Test().runTest() + +def fuseModifyFileTestHelperReadEndContents(mounttmp): + class Test(unittest.TestCase): + def runTest(self): + d1 = llfuse.listdir(mounttmp) + self.assertEqual(["file1.txt"], d1) + with open(os.path.join(mounttmp, "file1.txt")) as f: + self.assertEqual("plnp", f.read()) + Test().runTest() + +class FuseModifyFileTest(MountTestBase): def runTest(self): collection = arvados.collection.Collection(api_client=self.api) with collection.open("file1.txt", "w") as f: @@ -327,18 +340,13 @@ class FuseUpdateFileTest(MountTestBase): with llfuse.lock: m.new_collection(collection.api_response(), collection) - d1 = llfuse.listdir(self.mounttmp) - self.assertEqual(["file1.txt"], d1) - with open(os.path.join(self.mounttmp, "file1.txt")) as f: - self.assertEqual("blub", f.read()) + self.pool.apply(fuseModifyFileTestHelperReadStartContents, (self.mounttmp,)) with collection.open("file1.txt", "w") as f: f.write("plnp") - d1 = llfuse.listdir(self.mounttmp) - self.assertEqual(["file1.txt"], d1) - with open(os.path.join(self.mounttmp, "file1.txt")) as f: - self.assertEqual("plnp", f.read()) + self.pool.apply(fuseModifyFileTestHelperReadEndContents, (self.mounttmp,)) + class FuseAddFileToCollectionTest(MountTestBase): def runTest(self): @@ -361,6 +369,7 @@ class FuseAddFileToCollectionTest(MountTestBase): d1 = llfuse.listdir(self.mounttmp) self.assertEqual(["file1.txt", "file2.txt"], sorted(d1)) + class FuseRemoveFileFromCollectionTest(MountTestBase): def runTest(self): collection = arvados.collection.Collection(api_client=self.api) @@ -384,6 +393,14 @@ class FuseRemoveFileFromCollectionTest(MountTestBase): d1 = llfuse.listdir(self.mounttmp) self.assertEqual(["file1.txt"], d1) + +def fuseCreateFileTestHelper(mounttmp): + class Test(unittest.TestCase): + def runTest(self): + with open(os.path.join(mounttmp, "file1.txt"), "w") as f: + pass + Test().runTest() + class FuseCreateFileTest(MountTestBase): def runTest(self): collection = arvados.collection.Collection(api_client=self.api) @@ -401,8 +418,7 @@ class FuseCreateFileTest(MountTestBase): self.assertNotIn("file1.txt", collection) - with open(os.path.join(self.mounttmp, "file1.txt"), "w") as f: - pass + self.pool.apply(fuseCreateFileTestHelper, (self.mounttmp,)) self.assertIn("file1.txt", collection) @@ -411,16 +427,25 @@ class FuseCreateFileTest(MountTestBase): collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() self.assertRegexpMatches(collection2["manifest_text"], - r'\. d41d8cd98f00b204e9800998ecf8427e\+0\+A[a-f0-9]{40}@[a-f0-9]{8} 0:0:file1\.txt$') + r'\. d41d8cd98f00b204e9800998ecf8427e\+0\+A\S+ 0:0:file1\.txt$') + -def fuseWriteFileTestHelper(mounttmp): - with open(os.path.join(mounttmp, "file1.txt"), "r") as f: - return f.read() == "Hello world!" +def fuseWriteFileTestHelperWriteFile(mounttmp): + class Test(unittest.TestCase): + def runTest(self): + with open(os.path.join(mounttmp, "file1.txt"), "w") as f: + f.write("Hello world!") + Test().runTest() + +def fuseWriteFileTestHelperReadFile(mounttmp): + class Test(unittest.TestCase): + def runTest(self): + with open(os.path.join(mounttmp, "file1.txt"), "r") as f: + self.assertEqual(f.read(), "Hello world!") + Test().runTest() class FuseWriteFileTest(MountTestBase): def runTest(self): - arvados.logger.setLevel(logging.DEBUG) - collection = arvados.collection.Collection(api_client=self.api) collection.save_new() @@ -431,48 +456,44 @@ class FuseWriteFileTest(MountTestBase): self.assertNotIn("file1.txt", collection) - with open(os.path.join(self.mounttmp, "file1.txt"), "w") as f: - f.write("Hello world!") + self.assertEqual(0, self.operations.write_counter.get()) + self.pool.apply(fuseWriteFileTestHelperWriteFile, (self.mounttmp,)) + self.assertEqual(12, self.operations.write_counter.get()) with collection.open("file1.txt") as f: self.assertEqual(f.read(), "Hello world!") - # We can't just open the collection for reading because the underlying - # C implementation of open() makes a fstat() syscall with the GIL still - # held. When the GETATTR message comes back to llfuse (which in these - # tests is in the same interpreter process) it can't acquire the GIL, - # so it can't service the fstat() call, so it deadlocks. The - # workaround is to run some of our test code in a separate process. - # Forturnately the multiprocessing module makes this relatively easy. - pool = multiprocessing.Pool(1) - self.assertTrue(pool.apply(fuseWriteFileTestHelper, (self.mounttmp,))) - pool.close() + self.assertEqual(0, self.operations.read_counter.get()) + self.pool.apply(fuseWriteFileTestHelperReadFile, (self.mounttmp,)) + self.assertEqual(12, self.operations.read_counter.get()) collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() self.assertRegexpMatches(collection2["manifest_text"], - r'\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A[a-f0-9]{40}@[a-f0-9]{8} 0:12:file1\.txt$') - -def fuseUpdateFileTestHelper1(mounttmp): - with open(os.path.join(mounttmp, "file1.txt"), "r+") as f: - fr = f.read() - if fr != "Hello world!": - raise Exception("Got %s expected 'Hello world!'" % fr) - f.seek(0) - f.write("Hola mundo!") - f.seek(0) - fr = f.read() - if fr != "Hola mundo!!": - raise Exception("Got %s expected 'Hola mundo!!'" % fr) - return True - -def fuseUpdateFileTestHelper2(mounttmp): - with open(os.path.join(mounttmp, "file1.txt"), "r") as f: - return f.read() == "Hola mundo!!" + r'\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$') + + +def fuseUpdateFileTestHelper(mounttmp): + class Test(unittest.TestCase): + def runTest(self): + with open(os.path.join(mounttmp, "file1.txt"), "w") as f: + f.write("Hello world!") + + with open(os.path.join(mounttmp, "file1.txt"), "r+") as f: + fr = f.read() + self.assertEqual(fr, "Hello world!") + f.seek(0) + f.write("Hola mundo!") + f.seek(0) + fr = f.read() + self.assertEqual(fr, "Hola mundo!!") + + with open(os.path.join(mounttmp, "file1.txt"), "r") as f: + self.assertEqual(f.read(), "Hola mundo!!") + + Test().runTest() class FuseUpdateFileTest(MountTestBase): def runTest(self): - arvados.logger.setLevel(logging.DEBUG) - collection = arvados.collection.Collection(api_client=self.api) collection.save_new() @@ -481,24 +502,39 @@ class FuseUpdateFileTest(MountTestBase): m.new_collection(collection.api_response(), collection) self.assertTrue(m.writable()) - with open(os.path.join(self.mounttmp, "file1.txt"), "w") as f: - f.write("Hello world!") - - # See note in FuseWriteFileTest - pool = multiprocessing.Pool(1) - self.assertTrue(pool.apply(fuseUpdateFileTestHelper1, (self.mounttmp,))) - self.assertTrue(pool.apply(fuseUpdateFileTestHelper2, (self.mounttmp,))) - pool.close() + # See note in MountTestBase.setUp + self.pool.apply(fuseUpdateFileTestHelper, (self.mounttmp,)) collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() self.assertRegexpMatches(collection2["manifest_text"], - r'\. daaef200ebb921e011e3ae922dd3266b\+11\+A[a-f0-9]{40}@[a-f0-9]{8} 86fb269d190d2c85f6e0468ceca42a20\+12\+A[a-f0-9]{40}@[a-f0-9]{8} 0:11:file1\.txt 22:1:file1\.txt$') + r'\. daaef200ebb921e011e3ae922dd3266b\+11\+A\S+ 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:11:file1\.txt 22:1:file1\.txt$') + + +def fuseMkdirTestHelper(mounttmp): + class Test(unittest.TestCase): + def runTest(self): + with self.assertRaises(IOError): + with open(os.path.join(mounttmp, "testdir", "file1.txt"), "w") as f: + f.write("Hello world!") + + os.mkdir(os.path.join(mounttmp, "testdir")) + + with self.assertRaises(OSError): + os.mkdir(os.path.join(mounttmp, "testdir")) + + d1 = llfuse.listdir(mounttmp) + self.assertEqual(["testdir"], d1) + with open(os.path.join(mounttmp, "testdir", "file1.txt"), "w") as f: + f.write("Hello world!") + + d1 = llfuse.listdir(os.path.join(mounttmp, "testdir")) + self.assertEqual(["file1.txt"], d1) + + Test().runTest() class FuseMkdirTest(MountTestBase): def runTest(self): - arvados.logger.setLevel(logging.DEBUG) - collection = arvados.collection.Collection(api_client=self.api) collection.save_new() @@ -507,33 +543,64 @@ class FuseMkdirTest(MountTestBase): m.new_collection(collection.api_response(), collection) self.assertTrue(m.writable()) - with self.assertRaises(IOError): - with open(os.path.join(self.mounttmp, "testdir", "file1.txt"), "w") as f: + self.pool.apply(fuseMkdirTestHelper, (self.mounttmp,)) + + collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() + self.assertRegexpMatches(collection2["manifest_text"], + r'\./testdir 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$') + + +def fuseRmTestHelperWriteFile(mounttmp): + class Test(unittest.TestCase): + def runTest(self): + os.mkdir(os.path.join(mounttmp, "testdir")) + + with open(os.path.join(mounttmp, "testdir", "file1.txt"), "w") as f: f.write("Hello world!") - os.mkdir(os.path.join(self.mounttmp, "testdir")) + Test().runTest() - with self.assertRaises(OSError): - os.mkdir(os.path.join(self.mounttmp, "testdir")) +def fuseRmTestHelperDeleteFile(mounttmp): + class Test(unittest.TestCase): + def runTest(self): + # Can't delete because it's not empty + with self.assertRaises(OSError): + os.rmdir(os.path.join(mounttmp, "testdir")) - d1 = llfuse.listdir(self.mounttmp) - self.assertEqual(["testdir"], d1) + d1 = llfuse.listdir(os.path.join(mounttmp, "testdir")) + self.assertEqual(["file1.txt"], d1) - with open(os.path.join(self.mounttmp, "testdir", "file1.txt"), "w") as f: - f.write("Hello world!") + # Delete file + os.remove(os.path.join(mounttmp, "testdir", "file1.txt")) - d1 = llfuse.listdir(os.path.join(self.mounttmp, "testdir")) - self.assertEqual(["file1.txt"], d1) + # Make sure it's empty + d1 = llfuse.listdir(os.path.join(mounttmp, "testdir")) + self.assertEqual([], d1) - collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() - self.assertRegexpMatches(collection2["manifest_text"], - r'\./testdir 86fb269d190d2c85f6e0468ceca42a20\+12\+A[a-f0-9]{40}@[a-f0-9]{8} 0:12:file1\.txt$') + # Try to delete it again + with self.assertRaises(OSError): + os.remove(os.path.join(mounttmp, "testdir", "file1.txt")) + + Test().runTest() +def fuseRmTestHelperRmdir(mounttmp): + class Test(unittest.TestCase): + def runTest(self): + # Should be able to delete now that it is empty + os.rmdir(os.path.join(mounttmp, "testdir")) + + # Make sure it's empty + d1 = llfuse.listdir(os.path.join(mounttmp)) + self.assertEqual([], d1) + + # Try to delete it again + with self.assertRaises(OSError): + os.rmdir(os.path.join(mounttmp, "testdir")) + + Test().runTest() class FuseRmTest(MountTestBase): def runTest(self): - arvados.logger.setLevel(logging.DEBUG) - collection = arvados.collection.Collection(api_client=self.api) collection.save_new() @@ -542,58 +609,54 @@ class FuseRmTest(MountTestBase): m.new_collection(collection.api_response(), collection) self.assertTrue(m.writable()) - os.mkdir(os.path.join(self.mounttmp, "testdir")) - - with open(os.path.join(self.mounttmp, "testdir", "file1.txt"), "w") as f: - f.write("Hello world!") + self.pool.apply(fuseRmTestHelperWriteFile, (self.mounttmp,)) # Starting manifest collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() self.assertRegexpMatches(collection2["manifest_text"], - r'\./testdir 86fb269d190d2c85f6e0468ceca42a20\+12\+A[a-f0-9]{40}@[a-f0-9]{8} 0:12:file1\.txt$') + r'\./testdir 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$') + self.pool.apply(fuseRmTestHelperDeleteFile, (self.mounttmp,)) - # Can't delete because it's not empty - with self.assertRaises(OSError): - os.rmdir(os.path.join(self.mounttmp, "testdir")) + # Can't have empty directories :-( so manifest will be empty. + collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() + self.assertEqual(collection2["manifest_text"], "") - d1 = llfuse.listdir(os.path.join(self.mounttmp, "testdir")) - self.assertEqual(["file1.txt"], d1) + self.pool.apply(fuseRmTestHelperRmdir, (self.mounttmp,)) - # Delete file - os.remove(os.path.join(self.mounttmp, "testdir", "file1.txt")) + # manifest should be empty now. + collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() + self.assertEqual(collection2["manifest_text"], "") - # Make sure it's empty - d1 = llfuse.listdir(os.path.join(self.mounttmp, "testdir")) - self.assertEqual([], d1) - # Try to delete it again - with self.assertRaises(OSError): - os.remove(os.path.join(self.mounttmp, "testdir", "file1.txt")) +def fuseMvFileTestHelperWriteFile(mounttmp): + class Test(unittest.TestCase): + def runTest(self): + os.mkdir(os.path.join(mounttmp, "testdir")) - # Can't have empty directories :-( so manifest will be empty. - collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() - self.assertEqual(collection2["manifest_text"], "") + with open(os.path.join(mounttmp, "testdir", "file1.txt"), "w") as f: + f.write("Hello world!") - # Should be able to delete now that it is empty - os.rmdir(os.path.join(self.mounttmp, "testdir")) + Test().runTest() - # Make sure it's empty - d1 = llfuse.listdir(os.path.join(self.mounttmp)) - self.assertEqual([], d1) +def fuseMvFileTestHelperMoveFile(mounttmp): + class Test(unittest.TestCase): + def runTest(self): + d1 = llfuse.listdir(os.path.join(mounttmp)) + self.assertEqual(["testdir"], d1) + d1 = llfuse.listdir(os.path.join(mounttmp, "testdir")) + self.assertEqual(["file1.txt"], d1) - # Try to delete it again - with self.assertRaises(OSError): - os.rmdir(os.path.join(self.mounttmp, "testdir")) + os.rename(os.path.join(mounttmp, "testdir", "file1.txt"), os.path.join(mounttmp, "file1.txt")) - # manifest should be empty now. - collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() - self.assertEqual(collection2["manifest_text"], "") + d1 = llfuse.listdir(os.path.join(mounttmp)) + self.assertEqual(["file1.txt", "testdir"], sorted(d1)) + d1 = llfuse.listdir(os.path.join(mounttmp, "testdir")) + self.assertEqual([], d1) + Test().runTest() -class FuseMvTest(MountTestBase): +class FuseMvFileTest(MountTestBase): def runTest(self): - arvados.logger.setLevel(logging.DEBUG) - collection = arvados.collection.Collection(api_client=self.api) collection.save_new() @@ -602,37 +665,66 @@ class FuseMvTest(MountTestBase): m.new_collection(collection.api_response(), collection) self.assertTrue(m.writable()) - os.mkdir(os.path.join(self.mounttmp, "testdir")) + self.pool.apply(fuseMvFileTestHelperWriteFile, (self.mounttmp,)) + + # Starting manifest + collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() + self.assertRegexpMatches(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"], + r'\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$') + + +def fuseRenameTestHelper(mounttmp): + class Test(unittest.TestCase): + def runTest(self): + os.mkdir(os.path.join(mounttmp, "testdir")) - with open(os.path.join(self.mounttmp, "testdir", "file1.txt"), "w") as f: - f.write("Hello world!") + with open(os.path.join(mounttmp, "testdir", "file1.txt"), "w") as f: + f.write("Hello world!") + + Test().runTest() + +class FuseRenameTest(MountTestBase): + def runTest(self): + collection = arvados.collection.Collection(api_client=self.api) + collection.save_new() + + m = self.make_mount(fuse.CollectionDirectory) + with llfuse.lock: + m.new_collection(collection.api_response(), collection) + self.assertTrue(m.writable()) + + self.pool.apply(fuseRenameTestHelper, (self.mounttmp,)) # Starting manifest collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() self.assertRegexpMatches(collection2["manifest_text"], - r'\./testdir 86fb269d190d2c85f6e0468ceca42a20\+12\+A[a-f0-9]{40}@[a-f0-9]{8} 0:12:file1\.txt$') + r'\./testdir 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$') d1 = llfuse.listdir(os.path.join(self.mounttmp)) self.assertEqual(["testdir"], d1) d1 = llfuse.listdir(os.path.join(self.mounttmp, "testdir")) self.assertEqual(["file1.txt"], d1) - os.rename(os.path.join(self.mounttmp, "testdir", "file1.txt"), os.path.join(self.mounttmp, "file1.txt")) + os.rename(os.path.join(self.mounttmp, "testdir"), os.path.join(self.mounttmp, "testdir2")) d1 = llfuse.listdir(os.path.join(self.mounttmp)) - self.assertEqual(["file1.txt", "testdir"], sorted(d1)) - d1 = llfuse.listdir(os.path.join(self.mounttmp, "testdir")) - self.assertEqual([], d1) + self.assertEqual(["testdir2"], sorted(d1)) + d1 = llfuse.listdir(os.path.join(self.mounttmp, "testdir2")) + self.assertEqual(["file1.txt"], d1) collection2 = self.api.collections().get(uuid=collection.manifest_locator()).execute() self.assertRegexpMatches(collection2["manifest_text"], - r'\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A[a-f0-9]{40}@[a-f0-9]{8} 0:12:file1\.txt$') + r'\./testdir2 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$') class FuseUpdateFromEventTest(MountTestBase): def runTest(self): - arvados.logger.setLevel(logging.DEBUG) - collection = arvados.collection.Collection(api_client=self.api) collection.save_new() @@ -640,7 +732,7 @@ class FuseUpdateFromEventTest(MountTestBase): with llfuse.lock: m.new_collection(collection.api_response(), collection) - self.operations.listen_for_events(self.api) + self.operations.listen_for_events() d1 = llfuse.listdir(os.path.join(self.mounttmp)) self.assertEqual([], sorted(d1)) @@ -649,12 +741,322 @@ class FuseUpdateFromEventTest(MountTestBase): with collection2.open("file1.txt", "w") as f: f.write("foo") - time.sleep(1) + for attempt in AssertWithTimeout(10): + attempt(self.assertEqual, ["file1.txt"], llfuse.listdir(os.path.join(self.mounttmp))) + + +def fuseFileConflictTestHelper(mounttmp): + class Test(unittest.TestCase): + def runTest(self): + with open(os.path.join(mounttmp, "file1.txt"), "w") as f: + f.write("bar") + + d1 = sorted(llfuse.listdir(os.path.join(mounttmp))) + self.assertEqual(len(d1), 2) - # should show up via event bus notify + with open(os.path.join(mounttmp, "file1.txt"), "r") as f: + self.assertEqual(f.read(), "bar") + + self.assertRegexpMatches(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: + self.assertEqual(f.read(), "foo") + + Test().runTest() + +class FuseFileConflictTest(MountTestBase): + def runTest(self): + collection = arvados.collection.Collection(api_client=self.api) + collection.save_new() + + m = self.make_mount(fuse.CollectionDirectory) + with llfuse.lock: + m.new_collection(collection.api_response(), collection) d1 = llfuse.listdir(os.path.join(self.mounttmp)) - self.assertEqual(["file1.txt"], sorted(d1)) + 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,)) + + +def fuseUnlinkOpenFileTest(mounttmp): + class Test(unittest.TestCase): + def runTest(self): + with open(os.path.join(mounttmp, "file1.txt"), "w+") as f: + f.write("foo") + + d1 = llfuse.listdir(os.path.join(mounttmp)) + self.assertEqual(["file1.txt"], sorted(d1)) + + os.remove(os.path.join(mounttmp, "file1.txt")) + + d1 = llfuse.listdir(os.path.join(mounttmp)) + self.assertEqual([], sorted(d1)) + + f.seek(0) + self.assertEqual(f.read(), "foo") + f.write("bar") + + f.seek(0) + self.assertEqual(f.read(), "foobar") + + Test().runTest() + +class FuseUnlinkOpenFileTest(MountTestBase): + def runTest(self): + collection = arvados.collection.Collection(api_client=self.api) + collection.save_new() + + m = self.make_mount(fuse.CollectionDirectory) + with llfuse.lock: + m.new_collection(collection.api_response(), collection) + + # See note in MountTestBase.setUp + self.pool.apply(fuseUnlinkOpenFileTest, (self.mounttmp,)) + + self.assertEqual(collection.manifest_text(), "") + + +def fuseMvFileBetweenCollectionsTest1(mounttmp, uuid1, uuid2): + class Test(unittest.TestCase): + def runTest(self): + with open(os.path.join(mounttmp, uuid1, "file1.txt"), "w") as f: + f.write("Hello world!") + + d1 = os.listdir(os.path.join(mounttmp, uuid1)) + self.assertEqual(["file1.txt"], sorted(d1)) + d1 = os.listdir(os.path.join(mounttmp, uuid2)) + self.assertEqual([], sorted(d1)) + + Test().runTest() + +def fuseMvFileBetweenCollectionsTest2(mounttmp, uuid1, uuid2): + class Test(unittest.TestCase): + def runTest(self): + os.rename(os.path.join(mounttmp, uuid1, "file1.txt"), os.path.join(mounttmp, uuid2, "file2.txt")) + + d1 = os.listdir(os.path.join(mounttmp, uuid1)) + self.assertEqual([], sorted(d1)) + d1 = os.listdir(os.path.join(mounttmp, uuid2)) + self.assertEqual(["file2.txt"], sorted(d1)) + + Test().runTest() + +class FuseMvFileBetweenCollectionsTest(MountTestBase): + def runTest(self): + collection1 = arvados.collection.Collection(api_client=self.api) + collection1.save_new() + + collection2 = arvados.collection.Collection(api_client=self.api) + collection2.save_new() + + m = self.make_mount(fuse.MagicDirectory) + + # See note in MountTestBase.setUp + self.pool.apply(fuseMvFileBetweenCollectionsTest1, (self.mounttmp, + collection1.manifest_locator(), + collection2.manifest_locator())) + + collection1.update() + collection2.update() + + self.assertRegexpMatches(collection1.manifest_text(), r"\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$") + self.assertEqual(collection2.manifest_text(), "") + + self.pool.apply(fuseMvFileBetweenCollectionsTest2, (self.mounttmp, + collection1.manifest_locator(), + collection2.manifest_locator())) + + collection1.update() + collection2.update() + + self.assertEqual(collection1.manifest_text(), "") + self.assertRegexpMatches(collection2.manifest_text(), r"\. 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file2\.txt$") + + collection1.stop_threads() + collection2.stop_threads() + + +def fuseMvDirBetweenCollectionsTest1(mounttmp, uuid1, uuid2): + class Test(unittest.TestCase): + def runTest(self): + os.mkdir(os.path.join(mounttmp, uuid1, "testdir")) + with open(os.path.join(mounttmp, uuid1, "testdir", "file1.txt"), "w") as f: + f.write("Hello world!") + + d1 = os.listdir(os.path.join(mounttmp, uuid1)) + self.assertEqual(["testdir"], sorted(d1)) + d1 = os.listdir(os.path.join(mounttmp, uuid1, "testdir")) + self.assertEqual(["file1.txt"], sorted(d1)) + + d1 = os.listdir(os.path.join(mounttmp, uuid2)) + self.assertEqual([], sorted(d1)) + + Test().runTest() + + +def fuseMvDirBetweenCollectionsTest2(mounttmp, uuid1, uuid2): + class Test(unittest.TestCase): + def runTest(self): + os.rename(os.path.join(mounttmp, uuid1, "testdir"), os.path.join(mounttmp, uuid2, "testdir2")) + + d1 = os.listdir(os.path.join(mounttmp, uuid1)) + self.assertEqual([], sorted(d1)) + + d1 = os.listdir(os.path.join(mounttmp, uuid2)) + self.assertEqual(["testdir2"], sorted(d1)) + d1 = os.listdir(os.path.join(mounttmp, uuid2, "testdir2")) + self.assertEqual(["file1.txt"], sorted(d1)) + + with open(os.path.join(mounttmp, uuid2, "testdir2", "file1.txt"), "r") as f: + self.assertEqual(f.read(), "Hello world!") + + Test().runTest() + +class FuseMvDirBetweenCollectionsTest(MountTestBase): + def runTest(self): + collection1 = arvados.collection.Collection(api_client=self.api) + collection1.save_new() + + collection2 = arvados.collection.Collection(api_client=self.api) + collection2.save_new() + + m = self.make_mount(fuse.MagicDirectory) + + # See note in MountTestBase.setUp + self.pool.apply(fuseMvDirBetweenCollectionsTest1, (self.mounttmp, + collection1.manifest_locator(), + collection2.manifest_locator())) + + collection1.update() + collection2.update() + + self.assertRegexpMatches(collection1.manifest_text(), r"\./testdir 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$") + self.assertEqual(collection2.manifest_text(), "") + + self.pool.apply(fuseMvDirBetweenCollectionsTest2, (self.mounttmp, + collection1.manifest_locator(), + collection2.manifest_locator())) + + collection1.update() + collection2.update() + + self.assertEqual(collection1.manifest_text(), "") + self.assertRegexpMatches(collection2.manifest_text(), r"\./testdir2 86fb269d190d2c85f6e0468ceca42a20\+12\+A\S+ 0:12:file1\.txt$") + + collection1.stop_threads() + collection2.stop_threads() + +def fuseProjectMkdirTestHelper1(mounttmp): + class Test(unittest.TestCase): + def runTest(self): + os.mkdir(os.path.join(mounttmp, "testcollection")) + with self.assertRaises(OSError): + os.mkdir(os.path.join(mounttmp, "testcollection")) + Test().runTest() + +def fuseProjectMkdirTestHelper2(mounttmp): + class Test(unittest.TestCase): + def runTest(self): + with open(os.path.join(mounttmp, "testcollection", "file1.txt"), "w") as f: + f.write("Hello world!") + with self.assertRaises(OSError): + os.rmdir(os.path.join(mounttmp, "testcollection")) + os.remove(os.path.join(mounttmp, "testcollection", "file1.txt")) + with self.assertRaises(OSError): + os.remove(os.path.join(mounttmp, "testcollection")) + os.rmdir(os.path.join(mounttmp, "testcollection")) + Test().runTest() + +class FuseProjectMkdirRmdirTest(MountTestBase): + def runTest(self): + self.make_mount(fuse.ProjectDirectory, + project_object=self.api.users().current().execute()) + + d1 = llfuse.listdir(self.mounttmp) + self.assertNotIn('testcollection', d1) + + self.pool.apply(fuseProjectMkdirTestHelper1, (self.mounttmp,)) + + d1 = llfuse.listdir(self.mounttmp) + self.assertIn('testcollection', d1) + + self.pool.apply(fuseProjectMkdirTestHelper2, (self.mounttmp,)) + + d1 = llfuse.listdir(self.mounttmp) + self.assertNotIn('testcollection', d1) + + +def fuseProjectMvTestHelper1(mounttmp): + class Test(unittest.TestCase): + def runTest(self): + d1 = llfuse.listdir(mounttmp) + self.assertNotIn('testcollection', d1) + + os.mkdir(os.path.join(mounttmp, "testcollection")) + + d1 = llfuse.listdir(mounttmp) + self.assertIn('testcollection', d1) + + with self.assertRaises(OSError): + os.rename(os.path.join(mounttmp, "testcollection"), os.path.join(mounttmp, 'Unrestricted public data')) + + os.rename(os.path.join(mounttmp, "testcollection"), os.path.join(mounttmp, 'Unrestricted public data', 'testcollection')) + + d1 = llfuse.listdir(mounttmp) + self.assertNotIn('testcollection', d1) + + d1 = llfuse.listdir(os.path.join(mounttmp, 'Unrestricted public data')) + self.assertIn('testcollection', d1) + + Test().runTest() + +class FuseProjectMvTest(MountTestBase): + def runTest(self): + self.make_mount(fuse.ProjectDirectory, + project_object=self.api.users().current().execute()) + + self.pool.apply(fuseProjectMvTestHelper1, (self.mounttmp,)) + + +def fuseFsyncTestHelper(mounttmp, k): + class Test(unittest.TestCase): + def runTest(self): + fd = os.open(os.path.join(mounttmp, k), os.O_RDONLY) + os.fsync(fd) + os.close(fd) + + Test().runTest() + +class FuseFsyncTest(FuseMagicTest): + def runTest(self): + self.make_mount(fuse.MagicDirectory) + self.pool.apply(fuseFsyncTestHelper, (self.mounttmp, self.testcollection)) + + +class MagicDirApiError(FuseMagicTest): + def setUp(self): + api = mock.MagicMock() + super(MagicDirApiError, self).setUp(api=api) + api.collections().get().execute.side_effect = iter([Exception('API fail'), {"manifest_text": self.test_manifest}]) + api.keep.get.side_effect = Exception('Keep fail') + + def runTest(self): + self.make_mount(fuse.MagicDirectory) + + 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)) + + llfuse.listdir(os.path.join(self.mounttmp, self.testcollection)) class FuseUnitTest(unittest.TestCase): @@ -687,3 +1089,66 @@ class FuseUnitTest(unittest.TestCase): self.assertEqual("_", fuse.sanitize_filename("")) self.assertEqual("_", fuse.sanitize_filename(".")) self.assertEqual("__", fuse.sanitize_filename("..")) + + +class FuseMagicTestPDHOnly(MountTestBase): + def setUp(self, api=None): + super(FuseMagicTestPDHOnly, self).setUp(api=api) + + cw = arvados.CollectionWriter() + + cw.start_new_file('thing1.txt') + cw.write("data 1") + + self.testcollection = cw.finish() + self.test_manifest = cw.manifest_text() + created = self.api.collections().create(body={"manifest_text":self.test_manifest}).execute() + self.testcollectionuuid = str(created['uuid']) + + def verify_pdh_only(self, pdh_only=False, skip_pdh_only=False): + if skip_pdh_only is True: + self.make_mount(fuse.MagicDirectory) # in this case, the default by_id applies + else: + self.make_mount(fuse.MagicDirectory, pdh_only=pdh_only) + + mount_ls = llfuse.listdir(self.mounttmp) + self.assertIn('README', mount_ls) + self.assertFalse(any(arvados.util.keep_locator_pattern.match(fn) or + arvados.util.uuid_pattern.match(fn) + for fn in mount_ls), + "new FUSE MagicDirectory lists Collection") + + # look up using pdh should succeed in all cases + self.assertDirContents(self.testcollection, ['thing1.txt']) + self.assertDirContents(os.path.join('by_id', self.testcollection), + ['thing1.txt']) + mount_ls = llfuse.listdir(self.mounttmp) + self.assertIn('README', mount_ls) + self.assertIn(self.testcollection, mount_ls) + self.assertIn(self.testcollection, + llfuse.listdir(os.path.join(self.mounttmp, 'by_id'))) + + files = {} + files[os.path.join(self.mounttmp, self.testcollection, 'thing1.txt')] = 'data 1' + + for k, v in files.items(): + with open(os.path.join(self.mounttmp, k)) as f: + self.assertEqual(v, f.read()) + + # look up using uuid should fail when pdh_only is set + if pdh_only is True: + with self.assertRaises(OSError): + self.assertDirContents(os.path.join('by_id', self.testcollectionuuid), + ['thing1.txt']) + else: + self.assertDirContents(os.path.join('by_id', self.testcollectionuuid), + ['thing1.txt']) + + def test_with_pdh_only_true(self): + self.verify_pdh_only(pdh_only=True) + + def test_with_pdh_only_false(self): + self.verify_pdh_only(pdh_only=False) + + def test_with_default_by_id(self): + self.verify_pdh_only(skip_pdh_only=True)