X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a4959ce78b69f1f4e0e59e2458af8d11bc1d5510..3f647b8feb9868d74e2b480f355898305884596a:/services/fuse/arvados_fuse/fresh.py diff --git a/services/fuse/arvados_fuse/fresh.py b/services/fuse/arvados_fuse/fresh.py index 2a3a19c54c..ff548f29ee 100644 --- a/services/fuse/arvados_fuse/fresh.py +++ b/services/fuse/arvados_fuse/fresh.py @@ -2,17 +2,17 @@ # # SPDX-License-Identifier: AGPL-3.0 -import time import ciso8601 import calendar import functools +import time def convertTime(t): """Parse Arvados timestamp to unix time.""" if not t: return 0 try: - return calendar.timegm(ciso8601.parse_datetime_unaware(t).timetuple()) + return calendar.timegm(ciso8601.parse_datetime_as_naive(t).timetuple()) except (TypeError, ValueError): return 0 @@ -61,7 +61,7 @@ class FreshBase(object): """ __slots__ = ("_stale", "_poll", "_last_update", "_atime", "_poll_time", "use_count", - "ref_count", "dead", "cache_size", "cache_uuid", "allow_attr_cache") + "ref_count", "cache_size", "cache_uuid", "allow_attr_cache") def __init__(self): self._stale = True @@ -71,7 +71,6 @@ class FreshBase(object): self._poll_time = 60 self.use_count = 0 self.ref_count = 0 - self.dead = False self.cache_size = 0 self.cache_uuid = None @@ -124,17 +123,11 @@ class FreshBase(object): self.ref_count -= n return self.ref_count - def has_ref(self, only_children): + def has_ref(self): """Determine if there are any kernel references to this - object or its children. - - If only_children is True, ignore refcount of self and only consider - children. + object. """ - if only_children: - return False - else: - return self.ref_count > 0 + return self.ref_count > 0 def objsize(self): return 0