From 876d1f80e0344989f8b68799918c467fa5a52e19 Mon Sep 17 00:00:00 2001 From: Brett Smith Date: Tue, 16 Sep 2014 17:29:38 -0400 Subject: [PATCH] 3147: Add retry support to FUSE driver. --- services/fuse/arvados_fuse/__init__.py | 87 +++++++++++++++++--------- services/fuse/bin/arv-mount | 41 ++++++++---- services/fuse/tests/test_mount.py | 12 ++-- 3 files changed, 93 insertions(+), 47 deletions(-) diff --git a/services/fuse/arvados_fuse/__init__.py b/services/fuse/arvados_fuse/__init__.py index d5523e8083..e40b88ce9e 100644 --- a/services/fuse/arvados_fuse/__init__.py +++ b/services/fuse/arvados_fuse/__init__.py @@ -289,10 +289,11 @@ class Directory(FreshBase): class CollectionDirectory(Directory): '''Represents the root of a directory tree holding a collection.''' - def __init__(self, parent_inode, inodes, api, collection): + def __init__(self, parent_inode, inodes, api, num_retries, collection): super(CollectionDirectory, self).__init__(parent_inode) self.inodes = inodes self.api = api + self.num_retries = num_retries self.collection_object_file = None self.collection_object = None if isinstance(collection, dict): @@ -310,7 +311,9 @@ class CollectionDirectory(Directory): self.collection_object_file.update(self.collection_object) self.clear() - collection = arvados.CollectionReader(self.collection_object["manifest_text"], self.api, self.api.localkeep()) + collection = arvados.CollectionReader( + self.collection_object["manifest_text"], self.api, + self.api.localkeep(), num_retries=self.num_retries) for s in collection.all_streams(): cwd = self for part in s.name().split('/'): @@ -328,7 +331,9 @@ class CollectionDirectory(Directory): return True with llfuse.lock_released: - new_collection_object = self.api.collections().get(uuid=self.collection_locator).execute() + new_collection_object = self.api.collections().get( + uuid=self.collection_locator + ).execute(num_retries=self.num_retries) if "portable_data_hash" not in new_collection_object: new_collection_object["portable_data_hash"] = new_collection_object["uuid"] # end with llfuse.lock_released, re-acquire lock @@ -386,10 +391,11 @@ class MagicDirectory(Directory): to readdir(). ''' - def __init__(self, parent_inode, inodes, api): + def __init__(self, parent_inode, inodes, api, num_retries): super(MagicDirectory, self).__init__(parent_inode) self.inodes = inodes self.api = api + self.num_retries = num_retries # Have to defer creating readme_file because at this point we don't # yet have an inode assigned. self.readme_file = None @@ -418,7 +424,8 @@ will appear if it exists. return False try: - e = self.inodes.add_entry(CollectionDirectory(self.inode, self.inodes, self.api, k)) + e = self.inodes.add_entry(CollectionDirectory( + self.inode, self.inodes, self.api, self.num_retries, k)) if e.update(): self._entries[k] = e return True @@ -457,21 +464,25 @@ class RecursiveInvalidateDirectory(Directory): class TagsDirectory(RecursiveInvalidateDirectory): '''A special directory that contains as subdirectories all tags visible to the user.''' - def __init__(self, parent_inode, inodes, api, poll_time=60): + def __init__(self, parent_inode, inodes, api, num_retries, poll_time=60): super(TagsDirectory, self).__init__(parent_inode) self.inodes = inodes self.api = api + self.num_retries = num_retries self._poll = True self._poll_time = poll_time def update(self): with llfuse.lock_released: - tags = self.api.links().list(filters=[['link_class', '=', 'tag']], select=['name'], distinct = True).execute() + tags = self.api.links().list( + filters=[['link_class', '=', 'tag']], + select=['name'], distinct=True + ).execute(num_retries=self.num_retries) if "items" in tags: self.merge(tags['items'], lambda i: i['name'] if 'name' in i else i['uuid'], lambda a, i: a.tag == i, - lambda i: TagDirectory(self.inode, self.inodes, self.api, i['name'], poll=self._poll, poll_time=self._poll_time)) + lambda i: TagDirectory(self.inode, self.inodes, self.api, self.num_retries, i['name'], poll=self._poll, poll_time=self._poll_time)) class TagDirectory(Directory): @@ -479,45 +490,51 @@ class TagDirectory(Directory): to the user that are tagged with a particular tag. ''' - def __init__(self, parent_inode, inodes, api, tag, poll=False, poll_time=60): + def __init__(self, parent_inode, inodes, api, num_retries, tag, + poll=False, poll_time=60): super(TagDirectory, self).__init__(parent_inode) self.inodes = inodes self.api = api + self.num_retries = num_retries self.tag = tag self._poll = poll self._poll_time = poll_time def update(self): with llfuse.lock_released: - taggedcollections = self.api.links().list(filters=[['link_class', '=', 'tag'], - ['name', '=', self.tag], - ['head_uuid', 'is_a', 'arvados#collection']], - select=['head_uuid']).execute() + taggedcollections = self.api.links().list( + filters=[['link_class', '=', 'tag'], + ['name', '=', self.tag], + ['head_uuid', 'is_a', 'arvados#collection']], + select=['head_uuid'] + ).execute(num_retries=self.num_retries) self.merge(taggedcollections['items'], lambda i: i['head_uuid'], lambda a, i: a.collection_locator == i['head_uuid'], - lambda i: CollectionDirectory(self.inode, self.inodes, self.api, i['head_uuid'])) + lambda i: CollectionDirectory(self.inode, self.inodes, self.api, self.num_retries, i['head_uuid'])) class ProjectDirectory(Directory): '''A special directory that contains the contents of a project.''' - def __init__(self, parent_inode, inodes, api, project_object, poll=False, poll_time=60): + def __init__(self, parent_inode, inodes, api, num_retries, project_object, + poll=False, poll_time=60): super(ProjectDirectory, self).__init__(parent_inode) self.inodes = inodes self.api = api + self.num_retries = num_retries self.project_object = project_object self.project_object_file = None self.uuid = project_object['uuid'] def createDirectory(self, i): if collection_uuid_pattern.match(i['uuid']): - return CollectionDirectory(self.inode, self.inodes, self.api, i) + return CollectionDirectory(self.inode, self.inodes, self.api, self.num_retries, i) elif group_uuid_pattern.match(i['uuid']): - return ProjectDirectory(self.inode, self.inodes, self.api, i, self._poll, self._poll_time) + return ProjectDirectory(self.inode, self.inodes, self.api, self.num_retries, i, self._poll, self._poll_time) elif link_uuid_pattern.match(i['uuid']): if i['head_kind'] == 'arvados#collection' or portable_data_hash_pattern.match(i['head_uuid']): - return CollectionDirectory(self.inode, self.inodes, self.api, i['head_uuid']) + return CollectionDirectory(self.inode, self.inodes, self.api, self.num_retries, i['head_uuid']) else: return None elif uuid_pattern.match(i['uuid']): @@ -557,13 +574,19 @@ class ProjectDirectory(Directory): with llfuse.lock_released: if group_uuid_pattern.match(self.uuid): - self.project_object = self.api.groups().get(uuid=self.uuid).execute() + self.project_object = self.api.groups().get( + uuid=self.uuid).execute(num_retries=self.num_retries) elif user_uuid_pattern.match(self.uuid): - self.project_object = self.api.users().get(uuid=self.uuid).execute() + self.project_object = self.api.users().get( + uuid=self.uuid).execute(num_retries=self.num_retries) - contents = arvados.util.list_all(self.api.groups().contents, uuid=self.uuid) + contents = arvados.util.list_all(self.api.groups().contents, + self.num_retries, uuid=self.uuid) # Name links will be obsolete soon, take this out when there are no more pre-#3036 in use. - contents += arvados.util.list_all(self.api.links().list, filters=[['tail_uuid', '=', self.uuid], ['link_class', '=', 'name']]) + contents += arvados.util.list_all( + self.api.links().list, self.num_retries, + filters=[['tail_uuid', '=', self.uuid], + ['link_class', '=', 'name']]) # end with llfuse.lock_released, re-acquire lock @@ -589,17 +612,21 @@ class ProjectDirectory(Directory): class SharedDirectory(Directory): '''A special directory that represents users or groups who have shared projects with me.''' - def __init__(self, parent_inode, inodes, api, exclude, poll=False, poll_time=60): + def __init__(self, parent_inode, inodes, api, num_retries, exclude, + poll=False, poll_time=60): super(SharedDirectory, self).__init__(parent_inode) - self.current_user = api.users().current().execute() self.inodes = inodes self.api = api + self.num_retries = num_retries + self.current_user = api.users().current().execute(num_retries=num_retries) self._poll = True self._poll_time = poll_time def update(self): with llfuse.lock_released: - all_projects = arvados.util.list_all(self.api.groups().list, filters=[['group_class','=','project']]) + all_projects = arvados.util.list_all( + self.api.groups().list, self.num_retries, + filters=[['group_class','=','project']]) objects = {} for ob in all_projects: objects[ob['uuid']] = ob @@ -611,8 +638,12 @@ class SharedDirectory(Directory): roots.append(ob) root_owners[ob['owner_uuid']] = True - lusers = arvados.util.list_all(self.api.users().list, filters=[['uuid','in', list(root_owners)]]) - lgroups = arvados.util.list_all(self.api.groups().list, filters=[['uuid','in', list(root_owners)]]) + lusers = arvados.util.list_all( + self.api.users().list, self.num_retries, + filters=[['uuid','in', list(root_owners)]]) + lgroups = arvados.util.list_all( + self.api.groups().list, self.num_retries, + filters=[['uuid','in', list(root_owners)]]) users = {} groups = {} @@ -641,7 +672,7 @@ class SharedDirectory(Directory): self.merge(contents.items(), lambda i: i[0], lambda a, i: a.uuid == i[1]['uuid'], - lambda i: ProjectDirectory(self.inode, self.inodes, self.api, i[1], poll=self._poll, poll_time=self._poll_time)) + lambda i: ProjectDirectory(self.inode, self.inodes, self.api, self.num_retries, i[1], poll=self._poll, poll_time=self._poll_time)) except Exception as e: _logger.exception(e) diff --git a/services/fuse/bin/arv-mount b/services/fuse/bin/arv-mount index e07860d6b9..e92b1b4832 100755 --- a/services/fuse/bin/arv-mount +++ b/services/fuse/bin/arv-mount @@ -9,6 +9,7 @@ import signal import subprocess import time +import arvados.commands._util as arv_cmd from arvados_fuse import * logger = logging.getLogger('arvados.arv-mount') @@ -16,6 +17,7 @@ logger = logging.getLogger('arvados.arv-mount') if __name__ == '__main__': # Handle command line parameters parser = argparse.ArgumentParser( + parents=[arv_cmd.retry_opt], description='''Mount Keep data under the local filesystem. Default mode is --home''', epilog=""" Note: When using the --exec feature, you must either specify the @@ -80,29 +82,42 @@ with "--". operations = Operations(os.getuid(), os.getgid()) api = SafeApi(arvados.config) - usr = api.users().current().execute() + usr = api.users().current().execute(num_retries=args.retries) now = time.time() + dir_class = None + dir_args = [llfuse.ROOT_INODE, operations.inodes, api, args.retries] if args.by_id: # Set up the request handler with the 'magic directory' at the root - operations.inodes.add_entry(MagicDirectory(llfuse.ROOT_INODE, operations.inodes, api)) + dir_class = MagicDirectory elif args.by_tag: - operations.inodes.add_entry(TagsDirectory(llfuse.ROOT_INODE, operations.inodes, api)) + dir_class = TagsDirectory elif args.shared: - operations.inodes.add_entry(SharedDirectory(llfuse.ROOT_INODE, operations.inodes, api, usr)) + dir_class = SharedDirectory + dir_args.append(usr) elif args.home: - operations.inodes.add_entry(ProjectDirectory(llfuse.ROOT_INODE, operations.inodes, api, usr)) - elif args.collection != None: + dir_class = ProjectDirectory + dir_args.append(usr) + elif args.collection is not None: # Set up the request handler with the collection at the root - operations.inodes.add_entry(CollectionDirectory(llfuse.ROOT_INODE, operations.inodes, api, args.collection)) - elif args.project != None: - operations.inodes.add_entry(ProjectDirectory(llfuse.ROOT_INODE, operations.inodes, api, api.groups().get(uuid=args.project).execute())) + dir_class = CollectionDirectory + dir_args.append(args.collection) + elif args.project is not None: + dir_class = ProjectDirectory + dir_args.append(api.groups().get(uuid=args.project).execute( + num_retries=args.retries)) + + if dir_class is not None: + operations.inodes.add_entry(dir_class(*dir_args)) else: e = operations.inodes.add_entry(Directory(llfuse.ROOT_INODE)) + dir_args[0] = e.inode - e._entries['home'] = operations.inodes.add_entry(ProjectDirectory(e.inode, operations.inodes, api, usr)) - e._entries['shared'] = operations.inodes.add_entry(SharedDirectory(e.inode, operations.inodes, api, usr)) - e._entries['by_tag'] = operations.inodes.add_entry(TagsDirectory(e.inode, operations.inodes, api)) - e._entries['by_id'] = operations.inodes.add_entry(MagicDirectory(e.inode, operations.inodes, api)) + e._entries['by_id'] = operations.inodes.add_entry(MagicDirectory(*dir_args)) + e._entries['by_tag'] = operations.inodes.add_entry(TagsDirectory(*dir_args)) + + dir_args.append(usr) + e._entries['home'] = operations.inodes.add_entry(ProjectDirectory(*dir_args)) + e._entries['shared'] = operations.inodes.add_entry(SharedDirectory(*dir_args)) text = ''' Welcome to Arvados! This directory provides file system access to files and objects diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py index 9627777a52..a1f7d4bc3a 100644 --- a/services/fuse/tests/test_mount.py +++ b/services/fuse/tests/test_mount.py @@ -73,7 +73,7 @@ class FuseMountTest(MountTestBase): def runTest(self): # Create the request handler operations = fuse.Operations(os.getuid(), os.getgid()) - e = operations.inodes.add_entry(fuse.CollectionDirectory(llfuse.ROOT_INODE, operations.inodes, self.api, self.testcollection)) + e = operations.inodes.add_entry(fuse.CollectionDirectory(llfuse.ROOT_INODE, operations.inodes, self.api, 0, self.testcollection)) llfuse.init(operations, self.mounttmp, []) t = threading.Thread(None, lambda: llfuse.main()) @@ -128,7 +128,7 @@ class FuseMagicTest(MountTestBase): def runTest(self): # Create the request handler operations = fuse.Operations(os.getuid(), os.getgid()) - e = operations.inodes.add_entry(fuse.MagicDirectory(llfuse.ROOT_INODE, operations.inodes, self.api)) + e = operations.inodes.add_entry(fuse.MagicDirectory(llfuse.ROOT_INODE, operations.inodes, self.api, 0)) self.mounttmp = tempfile.mkdtemp() @@ -163,7 +163,7 @@ class FuseMagicTest(MountTestBase): class FuseTagsTest(MountTestBase): def runTest(self): operations = fuse.Operations(os.getuid(), os.getgid()) - e = operations.inodes.add_entry(fuse.TagsDirectory(llfuse.ROOT_INODE, operations.inodes, self.api)) + e = operations.inodes.add_entry(fuse.TagsDirectory(llfuse.ROOT_INODE, operations.inodes, self.api, 0)) llfuse.init(operations, self.mounttmp, []) t = threading.Thread(None, lambda: llfuse.main()) @@ -188,7 +188,7 @@ class FuseTagsTest(MountTestBase): class FuseTagsUpdateTest(MountTestBase): def runRealTest(self): operations = fuse.Operations(os.getuid(), os.getgid()) - e = operations.inodes.add_entry(fuse.TagsDirectory(llfuse.ROOT_INODE, operations.inodes, self.api, poll_time=1)) + e = operations.inodes.add_entry(fuse.TagsDirectory(llfuse.ROOT_INODE, operations.inodes, self.api, 0, poll_time=1)) llfuse.init(operations, self.mounttmp, []) t = threading.Thread(None, lambda: llfuse.main()) @@ -241,7 +241,7 @@ class FuseTagsUpdateTest(MountTestBase): class FuseSharedTest(MountTestBase): def runTest(self): operations = fuse.Operations(os.getuid(), os.getgid()) - e = operations.inodes.add_entry(fuse.SharedDirectory(llfuse.ROOT_INODE, operations.inodes, self.api, self.api.users().current().execute()['uuid'])) + e = operations.inodes.add_entry(fuse.SharedDirectory(llfuse.ROOT_INODE, operations.inodes, self.api, 0, self.api.users().current().execute()['uuid'])) llfuse.init(operations, self.mounttmp, []) t = threading.Thread(None, lambda: llfuse.main()) @@ -281,7 +281,7 @@ class FuseSharedTest(MountTestBase): class FuseHomeTest(MountTestBase): def runTest(self): operations = fuse.Operations(os.getuid(), os.getgid()) - e = operations.inodes.add_entry(fuse.ProjectDirectory(llfuse.ROOT_INODE, operations.inodes, self.api, self.api.users().current().execute())) + e = operations.inodes.add_entry(fuse.ProjectDirectory(llfuse.ROOT_INODE, operations.inodes, self.api, 0, self.api.users().current().execute())) llfuse.init(operations, self.mounttmp, []) t = threading.Thread(None, lambda: llfuse.main()) -- 2.39.5