Skip to content

remote: use deques for the RPC call queues, fixes #10450 #10454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ThomasWaldmann merged 1 commit into from
Sep 28, 2026
Merged

remote: use deques for the RPC call queues, fixes #10450 #10454

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions src/borg/remote.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import textwrap
import time
import traceback
from collections import deque
from subprocess import Popen, PIPE, TimeoutExpired

from . import __version__
Expand Down Expand Up @@ -557,7 +558,7 @@ def required_version(self):
def __init__(self, location, create=False, exclusive=False, lock_wait=None, lock=True, append_only=False,
make_parent_dirs=False, args=None):
self.location = self._location = location
self.preload_ids = []
self.preload_ids = deque()
self.msgid = 0
self.rx_bytes = 0
self.tx_bytes = 0
Expand Down Expand Up @@ -836,8 +837,8 @@ def handle_error(unpacked):
else:
raise self.RPCError(unpacked)

calls = list(calls)
waiting_for = []
calls = deque(calls)
waiting_for = deque()
maximum_to_send = 0 if wait else self.upload_buffer_size_limit
send_buffer() # Try to send data, as some cases (async_response) will never try to send data otherwise.
try:
Expand All @@ -851,7 +852,7 @@ def handle_error(unpacked):
while waiting_for:
try:
unpacked = self.responses.pop(waiting_for[0])
waiting_for.pop(0)
waiting_for.popleft()
if b'exception_class' in unpacked:
handle_error(unpacked)
else:
Expand Down Expand Up @@ -926,9 +927,9 @@ def handle_error(unpacked):
if is_preloaded:
assert cmd == 'get', "is_preload is only supported for 'get'"
if calls[0]['id'] in self.chunkid_to_msgids:
waiting_for.append(pop_preload_msgid(calls.pop(0)['id']))
waiting_for.append(pop_preload_msgid(calls.popleft()['id']))
else:
args = calls.pop(0)
args = calls.popleft()
if cmd == 'get' and args['id'] in self.chunkid_to_msgids:
waiting_for.append(pop_preload_msgid(args['id']))
else:
Expand All @@ -939,7 +940,7 @@ def handle_error(unpacked):
else:
self.to_send.push_back(msgpack.packb((1, self.msgid, cmd, self.named_to_positional(cmd, args))))
if not self.to_send and self.preload_ids:
chunk_id = self.preload_ids.pop(0)
chunk_id = self.preload_ids.popleft()
args = {'id': chunk_id}
self.msgid += 1
self.chunkid_to_msgids.setdefault(chunk_id, []).append(self.msgid)
Expand Down Expand Up @@ -1088,7 +1089,7 @@ def async_response(self, wait=True):
return resp

def preload(self, ids):
self.preload_ids += ids
self.preload_ids.extend(ids)


def handle_remote_line(line):
Expand Down
Loading