1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-24 08:45:13 +00:00

Fix sporadic "Resource temporarily unavailable" error

Issue reported on the mailing list while backing up to a remote
repository on OS X over a slow uplink.
This commit is contained in:
Jonas Borgström 2014-06-13 20:07:01 +02:00
parent 95162ce1f8
commit 15065dbaa4
2 changed files with 9 additions and 1 deletions

View file

@ -8,6 +8,7 @@ Version 0.13
(feature release, released on X)
- Fix sporadic "Resource temporarily unavailable" when using remote repositories
- Reduce file cache memory usage (#90)
- Faster AES encryption (utilizing AES-NI when available)
- Experimental Linux, OS X and FreeBSD ACL support (#66)

View file

@ -1,3 +1,4 @@
import errno
import fcntl
import msgpack
import os
@ -195,7 +196,13 @@ def fetch_from_cache(args):
self.to_send = msgpack.packb((1, self.msgid, cmd, args))
if self.to_send:
self.to_send = self.to_send[os.write(self.stdin_fd, self.to_send):]
try:
self.to_send = self.to_send[os.write(self.stdin_fd, self.to_send):]
except OSError as e:
# io.write might raise EAGAIN even though select indicates
# that the fd should be writable
if e.errno != errno.EAGAIN:
raise
if not self.to_send and not (calls or self.preload_ids):
w_fds = []
self.ignore_responses |= set(waiting_for)