X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/322599005b9425223195f8b903f0aa2cfc4b7db9..8a1aa45293e423d9b4fffc5115a14f2e69897d8e:/services/fuse/arvados_fuse/__init__.py diff --git a/services/fuse/arvados_fuse/__init__.py b/services/fuse/arvados_fuse/__init__.py index 0944a31875..31afcda8d1 100644 --- a/services/fuse/arvados_fuse/__init__.py +++ b/services/fuse/arvados_fuse/__init__.py @@ -61,24 +61,16 @@ from builtins import next from builtins import str from builtins import object import os -import sys import llfuse import errno import stat import threading import arvados -import pprint import arvados.events -import re -import apiclient -import json import logging import time -import _strptime -import calendar import threading import itertools -import ciso8601 import collections import functools import arvados.keep @@ -98,7 +90,7 @@ else: LLFUSE_VERSION_0 = llfuse.__version__.startswith('0') -from .fusedir import sanitize_filename, Directory, CollectionDirectory, TmpCollectionDirectory, MagicDirectory, TagsDirectory, ProjectDirectory, SharedDirectory, CollectionDirectoryBase +from .fusedir import Directory, CollectionDirectory, TmpCollectionDirectory, MagicDirectory, TagsDirectory, ProjectDirectory, SharedDirectory, CollectionDirectoryBase from .fusefile import StringFile, FuseArvadosFile _logger = logging.getLogger('arvados.arvados_fuse') @@ -337,6 +329,8 @@ def catch_exceptions(orig_func): raise except EnvironmentError as e: raise llfuse.FUSEError(e.errno) + except NotImplementedError: + raise llfuse.FUSEError(errno.ENOTSUP) except arvados.errors.KeepWriteError as e: _logger.error("Keep write error: " + str(e)) raise llfuse.FUSEError(errno.EIO) @@ -483,24 +477,13 @@ class Operations(llfuse.Operations): for item in self.inodes.inode_cache.find_by_uuid(ev["object_uuid"]): item.invalidate() - 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.child_event(ev) + parent.invalidate() @getattr_time.time() @catch_exceptions