X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/28e6503a62fbbff41224843c8c39f4052242c8cd..d1dbdfd430be8a1bdd21fc1f02f8fe5e2d989092:/services/fuse/arvados_fuse/__init__.py diff --git a/services/fuse/arvados_fuse/__init__.py b/services/fuse/arvados_fuse/__init__.py index 46c5a1b06b..cab44dd579 100644 --- a/services/fuse/arvados_fuse/__init__.py +++ b/services/fuse/arvados_fuse/__init__.py @@ -67,15 +67,24 @@ import ciso8601 import collections import functools +import Queue + +# Default _notify_queue has a limit of 1000 items, but it really needs to be +# unlimited to avoid deadlocks, see https://arvados.org/issues/3198#note-43 for +# details. + +llfuse.capi._notify_queue = Queue.Queue() + from fusedir import sanitize_filename, Directory, CollectionDirectory, MagicDirectory, TagsDirectory, ProjectDirectory, SharedDirectory, CollectionDirectoryBase from fusefile import StringFile, FuseArvadosFile _logger = logging.getLogger('arvados.arvados_fuse') -log_handler = logging.StreamHandler() -llogger = logging.getLogger('llfuse') -llogger.addHandler(log_handler) -llogger.setLevel(logging.DEBUG) +# Uncomment this to enable llfuse debug logging. +# log_handler = logging.StreamHandler() +# llogger = logging.getLogger('llfuse') +# llogger.addHandler(log_handler) +# llogger.setLevel(logging.DEBUG) class Handle(object): """Connects a numeric file handle to a File or Directory object that has @@ -145,7 +154,6 @@ class InodeCache(object): return True def cap_cache(self): - #_logger.debug("InodeCache total is %i cap is %i", self._total, self.cap) if self._total > self.cap: for key in list(self._entries.keys()): if self._total < self.cap or len(self._entries) < self.min_entries: @@ -183,10 +191,12 @@ class Inodes(object): """Manage the set of inodes. This is the mapping from a numeric id to a concrete File or Directory object""" - def __init__(self, inode_cache): + def __init__(self, inode_cache, encoding="utf-8"): self._entries = {} self._counter = itertools.count(llfuse.ROOT_INODE) self.inode_cache = inode_cache + self.encoding = encoding + self.deferred_invalidations = [] def __getitem__(self, item): return self._entries[item] @@ -217,15 +227,22 @@ class Inodes(object): def del_entry(self, entry): if entry.ref_count == 0: - _logger.debug("Deleting inode %i", entry.inode) self.inode_cache.unmanage(entry) - llfuse.invalidate_inode(entry.inode) del self._entries[entry.inode] + with llfuse.lock_released: + entry.finalize() + self.invalidate_inode(entry.inode) entry.inode = None else: entry.dead = True _logger.debug("del_entry on inode %i with refcount %i", entry.inode, entry.ref_count) + def invalidate_inode(self, inode): + llfuse.invalidate_inode(inode) + + def invalidate_entry(self, inode, name): + llfuse.invalidate_entry(inode, name) + def catch_exceptions(orig_func): """Catch uncaught exceptions and log them consistently.""" @@ -238,6 +255,12 @@ def catch_exceptions(orig_func): raise except EnvironmentError as e: raise llfuse.FUSEError(e.errno) + except arvados.errors.KeepWriteError as e: + _logger.error("Keep write error: " + str(e)) + raise llfuse.FUSEError(errno.EIO) + except arvados.errors.NotFoundError as e: + _logger.error("Block not found error: " + str(e)) + raise llfuse.FUSEError(errno.EIO) except: _logger.exception("Unhandled exception during FUSE operation") raise llfuse.FUSEError(errno.EIO) @@ -257,15 +280,15 @@ class Operations(llfuse.Operations): """ - def __init__(self, uid, gid, encoding="utf-8", inode_cache=None, num_retries=4): + def __init__(self, uid, gid, encoding="utf-8", inode_cache=None, num_retries=4, enable_write=False): super(Operations, self).__init__() if not inode_cache: inode_cache = InodeCache(cap=256*1024*1024) - self.inodes = Inodes(inode_cache) + self.inodes = Inodes(inode_cache, encoding=encoding) self.uid = uid self.gid = gid - self.encoding = encoding + self.enable_write = enable_write # dict of inode to filehandle self._filehandles = {} @@ -284,18 +307,28 @@ class Operations(llfuse.Operations): # initializing to continue self.initlock.set() + @catch_exceptions def destroy(self): if self.events: self.events.close() + self.events = None + + for k,v in self.inodes.items(): + try: + v.finalize() + except Exception as e: + _logger.exception("Error during finalize of inode %i", k) + self.inodes = None def access(self, inode, mode, ctx): return True def listen_for_events(self, api_client): - self.event = arvados.events.subscribe(api_client, + self.events = arvados.events.subscribe(api_client, [["event_type", "in", ["create", "update", "delete"]]], self.on_event) + @catch_exceptions def on_event(self, ev): if 'event_type' in ev: with llfuse.lock: @@ -303,11 +336,18 @@ class Operations(llfuse.Operations): if item is not None: item.invalidate() if ev["object_kind"] == "arvados#collection": - item.update(to_pdh=ev.get("properties", {}).get("new_attributes", {}).get("portable_data_hash")) + new_attr = ev.get("properties") and ev["properties"].get("new_attributes") and ev["properties"]["new_attributes"] + + # new_attributes.modified_at currently lacks subsecond precision (see #6347) so use event_at which + # should always be the same. + #record_version = (new_attr["modified_at"], new_attr["portable_data_hash"]) if new_attr else None + record_version = (ev["event_at"], new_attr["portable_data_hash"]) if new_attr else None + + item.update(to_record_version=record_version) else: item.update() - oldowner = ev.get("properties", {}).get("old_attributes", {}).get("owner_uuid") + oldowner = ev.get("properties") and ev["properties"].get("old_attributes") and ev["properties"]["old_attributes"].get("owner_uuid") olditemparent = self.inodes.inode_cache.find(oldowner) if olditemparent is not None: olditemparent.invalidate() @@ -318,6 +358,7 @@ class Operations(llfuse.Operations): itemparent.invalidate() itemparent.update() + @catch_exceptions def getattr(self, inode): if inode not in self.inodes: @@ -328,8 +369,8 @@ class Operations(llfuse.Operations): entry = llfuse.EntryAttributes() entry.st_ino = inode entry.generation = 0 - entry.entry_timeout = 300 - entry.attr_timeout = 300 + entry.entry_timeout = 60 + entry.attr_timeout = 60 entry.st_mode = stat.S_IRUSR | stat.S_IRGRP | stat.S_IROTH if isinstance(e, Directory): @@ -339,7 +380,7 @@ class Operations(llfuse.Operations): if isinstance(e, FuseArvadosFile): entry.st_mode |= stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH - if e.writable(): + if self.enable_write and e.writable(): entry.st_mode |= stat.S_IWUSR | stat.S_IWGRP | stat.S_IWOTH entry.st_nlink = 1 @@ -350,7 +391,7 @@ class Operations(llfuse.Operations): entry.st_size = e.size() entry.st_blksize = 512 - entry.st_blocks = (e.size()/512)+1 + entry.st_blocks = (entry.st_size/512)+1 entry.st_atime = int(e.atime()) entry.st_mtime = int(e.mtime()) entry.st_ctime = int(e.mtime()) @@ -372,7 +413,7 @@ class Operations(llfuse.Operations): @catch_exceptions def lookup(self, parent_inode, name): - name = unicode(name, self.encoding) + name = unicode(name, self.inodes.encoding) inode = None if name == '.': @@ -431,11 +472,7 @@ class Operations(llfuse.Operations): self.inodes.touch(handle.obj) - try: - return handle.obj.readfrom(off, size, self.num_retries) - except arvados.errors.NotFoundError as e: - _logger.error("Block not found: " + str(e)) - raise llfuse.FUSEError(errno.EIO) + return handle.obj.readfrom(off, size, self.num_retries) @catch_exceptions def write(self, fh, off, buf): @@ -457,12 +494,11 @@ class Operations(llfuse.Operations): if fh in self._filehandles: try: self._filehandles[fh].flush() - except EnvironmentError as e: - raise llfuse.FUSEError(e.errno) except Exception: - _logger.exception("Flush error") - self._filehandles[fh].release() - del self._filehandles[fh] + raise + finally: + self._filehandles[fh].release() + del self._filehandles[fh] self.inodes.inode_cache.cap_cache() def releasedir(self, fh): @@ -506,10 +542,7 @@ class Operations(llfuse.Operations): e = off while e < len(handle.entries): if handle.entries[e][1].inode in self.inodes: - try: - yield (handle.entries[e][0].encode(self.encoding), self.getattr(handle.entries[e][1].inode), e+1) - except UnicodeEncodeError: - pass + yield (handle.entries[e][0].encode(self.inodes.encoding), self.getattr(handle.entries[e][1].inode), e+1) e += 1 @catch_exceptions @@ -529,6 +562,9 @@ class Operations(llfuse.Operations): return st def _check_writable(self, inode_parent): + if not self.enable_write: + raise llfuse.FUSEError(errno.EROFS) + if inode_parent in self.inodes: p = self.inodes[inode_parent] else: @@ -544,6 +580,8 @@ class Operations(llfuse.Operations): @catch_exceptions def create(self, inode_parent, name, mode, flags, ctx): + _logger.debug("arv-mount create: %i '%s' %o", inode_parent, name, mode) + p = self._check_writable(inode_parent) p.create(name)