mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

RemoteRepository: Rename cache to chunkid_to_msgids. Also fetch_from_cache to pop_preload_msgid.

This commit is contained in:
Martin Hostettler 2016-08-05 21:51:01 +02:00
parent 2608a5620a
commit 02557f16b0
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/borg/remote.py
View File

@ -216,7 +216,7 @@ class RemoteRepository:
self.preload_ids = []
self.msgid = 0
self.to_send = b''
self.cache = {}
self.chunkid_to_msgids = {}
self.ignore_responses = set()
self.responses = {}
self.ratelimit = SleepingBandwidthLimiter(args.remote_ratelimit * 1024 if args and args.remote_ratelimit else 0)
@ -350,10 +350,10 @@ This problem will go away as soon as the server has been upgraded to 1.0.7+.
if not calls:
return
def fetch_from_cache(args):
msgid = self.cache[args].pop(0)
if not self.cache[args]:
del self.cache[args]
def pop_preload_msgid(chunkid):
msgid = self.chunkid_to_msgids[chunkid].pop(0)
if not self.chunkid_to_msgids[chunkid]:
del self.chunkid_to_msgids[chunkid]
return msgid
def handle_error(error, res):
@ -425,12 +425,12 @@ This problem will go away as soon as the server has been upgraded to 1.0.7+.
if calls:
if is_preloaded:
assert cmd == "get", "is_preload is only supported for 'get'"
if calls[0][0] in self.cache:
waiting_for.append(fetch_from_cache(calls.pop(0)[0]))
if calls[0][0] in self.chunkid_to_msgids:
waiting_for.append(pop_preload_msgid(calls.pop(0)[0]))
else:
args = calls.pop(0)
if cmd == 'get' and args[0] in self.cache:
waiting_for.append(fetch_from_cache(args[0]))
if cmd == 'get' and args[0] in self.chunkid_to_msgids:
waiting_for.append(pop_preload_msgid(args[0]))
else:
self.msgid += 1
waiting_for.append(self.msgid)
@ -439,7 +439,7 @@ This problem will go away as soon as the server has been upgraded to 1.0.7+.
chunk_id = self.preload_ids.pop(0)
args = (chunk_id,)
self.msgid += 1
self.cache.setdefault(chunk_id, []).append(self.msgid)
self.chunkid_to_msgids.setdefault(chunk_id, []).append(self.msgid)
self.to_send = msgpack.packb((1, self.msgid, 'get', args))
if self.to_send: