1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-23 08:16:54 +00:00

lrucache: regularly remove old FDs, fixes #4427

This commit is contained in:
Thomas Waldmann 2019-03-11 02:27:41 +01:00
parent e4438227c1
commit 6ae5530507
2 changed files with 16 additions and 10 deletions

View file

@ -50,7 +50,6 @@ def clear(self):
self._dispose(value)
self._cache.clear()
# useful for testing
def items(self):
return self._cache.items()

View file

@ -1216,6 +1216,7 @@ def __init__(self, path, limit, segments_per_dir, capacity=90):
self.segments_per_dir = segments_per_dir
self.offset = 0
self._write_fd = None
self._fds_cleaned = 0
def close(self):
self.close_segment()
@ -1346,19 +1347,25 @@ def open_fd():
self.fds[segment] = (now, fd)
return fd
def clean_old():
# we regularly get rid of all old FDs here:
if now - self._fds_cleaned > FD_MAX_AGE // 8:
self._fds_cleaned = now
for k, ts_fd in list(self.fds.items()):
ts, fd = ts_fd
if now - ts > FD_MAX_AGE:
# we do not want to touch long-unused file handles to
# avoid ESTALE issues (e.g. on network filesystems).
del self.fds[k]
clean_old()
try:
ts, fd = self.fds[segment]
except KeyError:
fd = open_fd()
else:
if now - ts > FD_MAX_AGE:
# we do not want to touch long-unused file handles to
# avoid ESTALE issues (e.g. on network filesystems).
del self.fds[segment]
fd = open_fd()
else:
# fd is fresh enough, so we use it.
# also, we update the timestamp of the lru cache entry.
# we only have fresh enough stuff here.
# update the timestamp of the lru cache entry.
self.fds.upd(segment, (now, fd))
return fd