mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-29 11:16:43 +00:00
Code Issues Releases Wiki Activity

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

Browse source
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 @@ def __init__(self, location, create=False, exclusive=False, lock_wait=None, lock
self.preload_ids = [] self.preload_ids = []
self.msgid = 0 self.msgid = 0
self.to_send = b'' self.to_send = b''
self.cache = {} self.chunkid_to_msgids = {}
self.ignore_responses = set() self.ignore_responses = set()
self.responses = {} self.responses = {}
self.ratelimit = SleepingBandwidthLimiter(args.remote_ratelimit * 1024 if args and args.remote_ratelimit else 0) self.ratelimit = SleepingBandwidthLimiter(args.remote_ratelimit * 1024 if args and args.remote_ratelimit else 0)
@ -350,10 +350,10 @@ def call_many(self, cmd, calls, wait=True, is_preloaded=False):
if not calls: if not calls:
return return
def fetch_from_cache(args): def pop_preload_msgid(chunkid):
msgid = self.cache[args].pop(0) msgid = self.chunkid_to_msgids[chunkid].pop(0)
if not self.cache[args]: if not self.chunkid_to_msgids[chunkid]:
del self.cache[args] del self.chunkid_to_msgids[chunkid]
return msgid return msgid
def handle_error(error, res): def handle_error(error, res):
@ -425,12 +425,12 @@ def handle_error(error, res):
if calls: if calls:
if is_preloaded: if is_preloaded:
assert cmd == "get", "is_preload is only supported for 'get'" assert cmd == "get", "is_preload is only supported for 'get'"
if calls[0][0] in self.cache: if calls[0][0] in self.chunkid_to_msgids:
waiting_for.append(fetch_from_cache(calls.pop(0)[0])) waiting_for.append(pop_preload_msgid(calls.pop(0)[0]))
else: else:
args = calls.pop(0) args = calls.pop(0)
if cmd == 'get' and args[0] in self.cache: if cmd == 'get' and args[0] in self.chunkid_to_msgids:
waiting_for.append(fetch_from_cache(args[0])) waiting_for.append(pop_preload_msgid(args[0]))
else: else:
self.msgid += 1 self.msgid += 1
waiting_for.append(self.msgid) waiting_for.append(self.msgid)
@ -439,7 +439,7 @@ def handle_error(error, res):
chunk_id = self.preload_ids.pop(0) chunk_id = self.preload_ids.pop(0)
args = (chunk_id,) args = (chunk_id,)
self.msgid += 1 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)) self.to_send = msgpack.packb((1, self.msgid, 'get', args))
if self.to_send: if self.to_send: