Merge branch '3198-inode-cache' into 3198-writable-fuse, fix tests.

[arvados.git] / services / fuse / arvados_fuse / fusedir.py

diff --git a/services/fuse/arvados_fuse/fusedir.py b/services/fuse/arvados_fuse/fusedir.py
index d77fba48b2b4d513131aecd8808491b4f91b69ee..898af31d263904d73dcd3583ac0c9f83cf54eb4b 100644 (file)
--- a/services/fuse/arvados_fuse/fusedir.py
+++ b/services/fuse/arvados_fuse/fusedir.py
@@ -297,13 +297,13 @@ class CollectionDirectory(CollectionDirectoryBase):
                         new_collection_record["portable_data_hash"] = new_collection_record["uuid"]
                     if 'manifest_text' not in new_collection_record:
                         new_collection_record['manifest_text'] = coll_reader.manifest_text()
-            # end with llfuse.lock_released, re-acquire lock
 
-            if self.collection_record is None or self.collection_record["portable_data_hash"] != new_collection_record["portable_data_hash"]:
-                self.new_collection(new_collection_record, coll_reader)
+                    if self.collection_record is None or self.collection_record["portable_data_hash"] != new_collection_record.get("portable_data_hash"):
+                        self.new_collection(new_collection_record, coll_reader)
 
-            self._manifest_size = len(coll_reader.manifest_text())
-            _logger.debug("%s manifest_size %i", self, self._manifest_size)
+                    self._manifest_size = len(coll_reader.manifest_text())
+                    _logger.debug("%s manifest_size %i", self, self._manifest_size)
+            # end with llfuse.lock_released, re-acquire lock
 
             self.fresh()
             return True
@@ -572,8 +572,6 @@ class ProjectDirectory(Directory):
     def persisted(self):
         return False
 
-    def objsize(self):
-        return len(self.project_object) * 1024 if self.project_object else 0
 
 class SharedDirectory(Directory):
     """A special directory that represents users or groups who have shared projects with me."""