X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6599088b45103087b4be743fd51a8330e694e57f..47eb67e4c084abde49d5463d4ced8b4436a59dfd:/services/fuse/arvados_fuse/__init__.py diff --git a/services/fuse/arvados_fuse/__init__.py b/services/fuse/arvados_fuse/__init__.py index 1d25aa83cb..788d475e33 100644 --- a/services/fuse/arvados_fuse/__init__.py +++ b/services/fuse/arvados_fuse/__init__.py @@ -1,3 +1,7 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + """FUSE driver for Arvados Keep Architecture: @@ -81,6 +85,8 @@ else: # llfuse >= 0.42 llfuse._notify_queue = Queue.Queue() +LLFUSE_VERSION_0 = llfuse.__version__.startswith('0') + from fusedir import sanitize_filename, Directory, CollectionDirectory, TmpCollectionDirectory, MagicDirectory, TagsDirectory, ProjectDirectory, SharedDirectory, CollectionDirectoryBase from fusefile import StringFile, FuseArvadosFile @@ -105,14 +111,16 @@ class Handle(object): self.obj.dec_use() def flush(self): - if self.obj.writable(): - return self.obj.flush() + pass class FileHandle(Handle): """Connects a numeric file handle to a File object that has been opened by the client.""" - pass + + def flush(self): + if self.obj.writable(): + return self.obj.flush() class DirectoryHandle(Handle): @@ -152,9 +160,10 @@ class InodeCache(object): _logger.debug("InodeCache cannot clear inode %i, in use", obj.inode) return if obj.has_ref(True): - obj.kernel_invalidate() - _logger.debug("InodeCache sent kernel invalidate inode %i", obj.inode) + _logger.debug("InodeCache cannot clear inode %i, still referenced", obj.inode) return + obj.kernel_invalidate() + _logger.debug("InodeCache sent kernel invalidate inode %i", obj.inode) obj.clear() # The llfuse lock is released in del_entry(), which is called by @@ -258,17 +267,22 @@ class Inodes(object): 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_inode(self, entry): + if entry.has_ref(False): + # Only necessary if the kernel has previously done a lookup on this + # inode and hasn't yet forgotten about it. + llfuse.invalidate_inode(entry.inode) - def invalidate_entry(self, inode, name): - llfuse.invalidate_entry(inode, name.encode(self.encoding)) + def invalidate_entry(self, entry, name): + if entry.has_ref(False): + # Only necessary if the kernel has previously done a lookup on this + # inode and hasn't yet forgotten about it. + llfuse.invalidate_entry(entry.inode, name.encode(self.encoding)) def clear(self): self.inode_cache.clear() @@ -365,7 +379,9 @@ class Operations(llfuse.Operations): self.events.close() self.events = None - if llfuse.lock.acquire(): + # Different versions of llfuse require and forbid us to + # acquire the lock here. See #8345#note-37, #10805#note-9. + if LLFUSE_VERSION_0 and llfuse.lock.acquire(): # llfuse < 0.42 self.inodes.clear() llfuse.lock.release() @@ -384,30 +400,33 @@ class Operations(llfuse.Operations): @catch_exceptions def on_event(self, ev): - if 'event_type' not in ev: + if 'event_type' not in ev or ev["event_type"] not in ("create", "update", "delete"): return with llfuse.lock: - new_attrs = (ev.get("properties") or {}).get("new_attributes") or {} - pdh = new_attrs.get("portable_data_hash") - # new_attributes.modified_at currently lacks - # subsecond precision (see #6347) so use event_at - # which should always be the same. - stamp = ev.get("event_at") + properties = ev.get("properties") or {} + old_attrs = properties.get("old_attributes") or {} + new_attrs = properties.get("new_attributes") or {} for item in self.inodes.inode_cache.find_by_uuid(ev["object_uuid"]): item.invalidate() - if stamp and pdh and ev.get("object_kind") == "arvados#collection": - item.update(to_record_version=(stamp, pdh)) - else: - item.update() - - oldowner = ((ev.get("properties") or {}).get("old_attributes") or {}).get("owner_uuid") + if ev.get("object_kind") == "arvados#collection": + pdh = new_attrs.get("portable_data_hash") + # new_attributes.modified_at currently lacks + # subsecond precision (see #6347) so use event_at + # which should always be the same. + stamp = ev.get("event_at") + if (stamp and pdh and item.writable() and + item.collection is not None and + item.collection.modified() and + new_attrs.get("is_trashed") is not True): + item.update(to_record_version=(stamp, pdh)) + + oldowner = old_attrs.get("owner_uuid") newowner = ev.get("object_owner_uuid") for parent in ( self.inodes.inode_cache.find_by_uuid(oldowner) + self.inodes.inode_cache.find_by_uuid(newowner)): - parent.invalidate() - parent.update() + parent.child_event(ev) @catch_exceptions def getattr(self, inode, ctx=None): @@ -419,8 +438,8 @@ class Operations(llfuse.Operations): entry = llfuse.EntryAttributes() entry.st_ino = inode entry.generation = 0 - entry.entry_timeout = 60 if e.allow_dirent_cache else 0 - entry.attr_timeout = 60 if e.allow_attr_cache else 0 + entry.entry_timeout = 0 + entry.attr_timeout = e.time_to_next_poll() if e.allow_attr_cache else 0 entry.st_mode = stat.S_IRUSR | stat.S_IRGRP | stat.S_IROTH if isinstance(e, Directory): @@ -589,6 +608,7 @@ class Operations(llfuse.Operations): @catch_exceptions def release(self, fh): if fh in self._filehandles: + _logger.debug("arv-mount release fh %i", fh) try: self._filehandles[fh].flush() except Exception: