De-duplication of onedata objectstore code.

Use caching abstractions and bring in line with other object stores.
galaxyproject · May 19, 2024 · 89becf6 · 89becf6
1 parent 9d2a45f
commit 89becf6
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 314 deletions.
diff --git a/lib/galaxy/objectstore/_caching_base.py b/lib/galaxy/objectstore/_caching_base.py
@@ -254,11 +254,14 @@ def _empty(self, obj, **kwargs):
         else:
             raise ObjectNotFound(f"objectstore.empty, object does not exist: {obj}, kwargs: {kwargs}")
 
+    def _get_size_in_cache(self, rel_path):
+        return os.path.getsize(self._get_cache_path(rel_path))
+
     def _size(self, obj, **kwargs):
         rel_path = self._construct_path(obj, **kwargs)
         if self._in_cache(rel_path):
             try:
-                return os.path.getsize(self._get_cache_path(rel_path))
+                return self._get_size_in_cache(rel_path)
             except OSError as ex:
                 log.info("Could not get size of file '%s' in local cache, will try Azure. Error: %s", rel_path, ex)
         elif self._exists_remotely(rel_path):