X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/15ac0086cc6623fa3e4c601c19a14fdcd6c139ca..2dc308e3106090e2a19185e26cff22c6136bb5c4:/services/fuse/arvados_fuse/fusedir.py diff --git a/services/fuse/arvados_fuse/fusedir.py b/services/fuse/arvados_fuse/fusedir.py index 5ebb6b94ae..3f2bcd5ec2 100644 --- a/services/fuse/arvados_fuse/fusedir.py +++ b/services/fuse/arvados_fuse/fusedir.py @@ -8,8 +8,9 @@ import functools import threading from apiclient import errors as apiclient_errors import errno +import time -from fusefile import StringFile, ObjectFile, FuseArvadosFile +from fusefile import StringFile, ObjectFile, FuncToJSONFile, FuseArvadosFile from fresh import FreshBase, convertTime, use_counter, check_update import arvados.collection @@ -23,6 +24,7 @@ _logger = logging.getLogger('arvados.arvados_fuse') # appear as underscores in the fuse mount.) _disallowed_filename_characters = re.compile('[\x00/]') +# '.' and '..' are not reachable if API server is newer than #6277 def sanitize_filename(dirty): """Replace disallowed filename characters with harmless "_".""" if dirty is None: @@ -182,6 +184,9 @@ class Directory(FreshBase): def flush(self): pass + def want_event_subscribe(self): + raise NotImplementedError() + def create(self, name): raise NotImplementedError() @@ -315,6 +320,11 @@ class CollectionDirectoryBase(Directory): self.flush() src.flush() + def clear(self, force=False): + r = super(CollectionDirectoryBase, self).clear(force) + self.collection = None + return r + class CollectionDirectory(CollectionDirectoryBase): """Represents the root of a directory tree representing a collection.""" @@ -325,6 +335,13 @@ class CollectionDirectory(CollectionDirectoryBase): self.num_retries = num_retries self.collection_record_file = None self.collection_record = None + self._poll = True + try: + self._poll_time = (api._rootDesc.get('blobSignatureTtl', 60*60*2)/2) + except: + _logger.debug("Error getting blobSignatureTtl from discovery document: %s", sys.exc_info()[0]) + self._poll_time = 60*60 + if isinstance(collection_record, dict): self.collection_locator = collection_record['uuid'] self._mtime = convertTime(collection_record.get('modified_at')) @@ -342,6 +359,9 @@ class CollectionDirectory(CollectionDirectoryBase): def writable(self): return self.collection.writable() if self.collection is not None else self._writable + def want_event_subscribe(self): + return (uuid_pattern.match(self.collection_locator) is not None) + # Used by arv-web.py to switch the contents of the CollectionDirectory def change_collection(self, new_locator): """Switch the contents of the CollectionDirectory. @@ -433,6 +453,7 @@ class CollectionDirectory(CollectionDirectoryBase): _logger.exception("arv-mount %s: error", self.collection_locator) if self.collection_record is not None and "manifest_text" in self.collection_record: _logger.error("arv-mount manifest_text is: %s", self.collection_record["manifest_text"]) + self.invalidate() return False @use_counter @@ -473,6 +494,79 @@ class CollectionDirectory(CollectionDirectoryBase): self.collection.stop_threads() +class TmpCollectionDirectory(CollectionDirectoryBase): + """A directory backed by an Arvados collection that never gets saved. + + This supports using Keep as scratch space. A userspace program can + read the .arvados#collection file to get a current manifest in + order to save a snapshot of the scratch data or use it as a crunch + job output. + """ + + class UnsaveableCollection(arvados.collection.Collection): + def save(self): + pass + def save_new(self): + pass + + def __init__(self, parent_inode, inodes, api_client, num_retries): + collection = self.UnsaveableCollection( + api_client=api_client, + keep_client=api_client.keep, + num_retries=num_retries) + super(TmpCollectionDirectory, self).__init__( + parent_inode, inodes, collection) + self.collection_record_file = None + self.populate(self.mtime()) + + def on_event(self, *args, **kwargs): + super(TmpCollectionDirectory, self).on_event(*args, **kwargs) + if self.collection_record_file: + with llfuse.lock: + self.collection_record_file.invalidate() + self.inodes.invalidate_inode(self.collection_record_file.inode) + _logger.debug("%s invalidated collection record", self) + + def collection_record(self): + with llfuse.lock_released: + return { + "uuid": None, + "manifest_text": self.collection.manifest_text(), + "portable_data_hash": self.collection.portable_data_hash(), + } + + def __contains__(self, k): + return (k == '.arvados#collection' or + super(TmpCollectionDirectory, self).__contains__(k)) + + @use_counter + def __getitem__(self, item): + if item == '.arvados#collection': + if self.collection_record_file is None: + self.collection_record_file = FuncToJSONFile( + self.inode, self.collection_record) + self.inodes.add_entry(self.collection_record_file) + return self.collection_record_file + return super(TmpCollectionDirectory, self).__getitem__(item) + + def persisted(self): + return False + + def writable(self): + return True + + def want_event_subscribe(self): + return False + + def finalize(self): + self.collection.stop_threads() + + def invalidate(self): + if self.collection_record_file: + self.collection_record_file.invalidate() + super(TmpCollectionDirectory, self).invalidate() + + class MagicDirectory(Directory): """A special directory that logically contains the set of all extant keep locators. @@ -487,18 +581,20 @@ class MagicDirectory(Directory): README_TEXT = """ This directory provides access to Arvados collections as subdirectories listed by uuid (in the form 'zzzzz-4zz18-1234567890abcde') or portable data hash (in -the form '1234567890abcdefghijklmnopqrstuv+123'). +the form '1234567890abcdef0123456789abcdef+123'). Note that this directory will appear empty until you attempt to access a specific collection subdirectory (such as trying to 'cd' into it), at which point the collection will actually be looked up on the server and the directory will appear if it exists. + """.lstrip() - def __init__(self, parent_inode, inodes, api, num_retries): + def __init__(self, parent_inode, inodes, api, num_retries, pdh_only=False): super(MagicDirectory, self).__init__(parent_inode, inodes) self.api = api self.num_retries = num_retries + self.pdh_only = pdh_only def __setattr__(self, name, value): super(MagicDirectory, self).__setattr__(name, value) @@ -510,13 +606,13 @@ will appear if it exists. # If we're the root directory, add an identical by_id subdirectory. if self.inode == llfuse.ROOT_INODE: self._entries['by_id'] = self.inodes.add_entry(MagicDirectory( - self.inode, self.inodes, self.api, self.num_retries)) + self.inode, self.inodes, self.api, self.num_retries, self.pdh_only)) def __contains__(self, k): if k in self._entries: return True - if not portable_data_hash_pattern.match(k) and not uuid_pattern.match(k): + if not portable_data_hash_pattern.match(k) and (self.pdh_only or not uuid_pattern.match(k)): return False try: @@ -524,13 +620,18 @@ will appear if it exists. self.inode, self.inodes, self.api, self.num_retries, k)) if e.update(): - self._entries[k] = e + if k not in self._entries: + self._entries[k] = e + else: + self.inodes.del_entry(e) return True else: - _logger.debug('update failed of %s', k) + self.inodes.invalidate_entry(self.inode, k) + self.inodes.del_entry(e) return False - except Exception as e: - _logger.debug('arv-mount exception keep %s', e) + except Exception as ex: + _logger.debug('arv-mount exception keep %s', ex) + self.inodes.del_entry(e) return False def __getitem__(self, item): @@ -542,6 +643,9 @@ will appear if it exists. def clear(self, force=False): pass + def want_event_subscribe(self): + return not self.pdh_only + class RecursiveInvalidateDirectory(Directory): def invalidate(self): @@ -563,6 +667,9 @@ class TagsDirectory(RecursiveInvalidateDirectory): self._poll = True self._poll_time = poll_time + def want_event_subscribe(self): + return True + @use_counter def update(self): with llfuse.lock_released: @@ -591,6 +698,9 @@ class TagDirectory(Directory): self._poll = poll self._poll_time = poll_time + def want_event_subscribe(self): + return True + @use_counter def update(self): with llfuse.lock_released: @@ -622,6 +732,9 @@ class ProjectDirectory(Directory): self._updating_lock = threading.Lock() self._current_user = None + def want_event_subscribe(self): + return True + def createDirectory(self, i): if collection_uuid_pattern.match(i['uuid']): return CollectionDirectory(self.inode, self.inodes, self.api, self.num_retries, i) @@ -842,3 +955,6 @@ class SharedDirectory(Directory): lambda i: ProjectDirectory(self.inode, self.inodes, self.api, self.num_retries, i[1], poll=self._poll, poll_time=self._poll_time)) except Exception: _logger.exception() + + def want_event_subscribe(self): + return True