projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '18995-code-cleanup-2'
[arvados.git]
/
sdk
/
python
/
arvados
/
arvfile.py
diff --git
a/sdk/python/arvados/arvfile.py
b/sdk/python/arvados/arvfile.py
index fbf593d02619810b1647f78520217ac6a9b4bef7..2ce0e46b30bd67ad948f832183ab091865c2ea53 100644
(file)
--- a/
sdk/python/arvados/arvfile.py
+++ b/
sdk/python/arvados/arvfile.py
@@
-593,10
+593,7
@@
class _BlockManager(object):
b = self._prefetch_queue.get()
if b is None:
return
b = self._prefetch_queue.get()
if b is None:
return
- if self._keep.has_cache_slot(b):
- continue
- _logger.debug("prefetching %s", b)
- self._keep.get(b)
+ self._keep.get(b, prefetch=True)
except Exception:
_logger.exception("Exception doing block prefetch")
except Exception:
_logger.exception("Exception doing block prefetch")
@@
-844,15
+841,11
@@
class _BlockManager(object):
if not self.prefetch_enabled:
return
if not self.prefetch_enabled:
return
- if self._keep.has_cache_slot(locator):
- return
-
with self.lock:
if locator in self._bufferblocks:
return
self.start_get_threads()
with self.lock:
if locator in self._bufferblocks:
return
self.start_get_threads()
- # _logger.debug("pushing %s to prefetch", locator)
self._prefetch_queue.put(locator)
self._prefetch_queue.put(locator)