upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-02-24 10:21:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #4609 from ThomasWaldmann/1.1-fixes

Browse source 
cosmetic fixes (1.1)
This commit is contained in:
TW 2019-06-09 14:41:24 +02:00 committed by GitHub
commit b2ea4e77ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docs/usage/serve.rst
View file

@ -40,7 +40,7 @@ locations like ``/etc/environment`` or in the forced command itself (example bel
``no-port-forwarding,no-X11-forwarding,no-pty,no-agent-forwarding,no-user-rc``
in this case.
SSH Configuration
~~~~~~~~~~~~~~~~~
``borg serve``'s pipes (``stdin``/``stdout``/``stderr``) are connected to the ``sshd`` process on the server side. In the event that the SSH connection between ``borg serve`` and the client is disconnected or stuck abnormally (for example, due to a network outage), it can take a long time for ``sshd`` to notice the client is disconnected. In the meantime, ``sshd`` continues running, and as a result so does the ``borg serve`` process holding the lock on the repository. This can cause subsequent ``borg`` operations on the remote repository to fail with the error: ``Failed to create/acquire the lock``.
@ -69,4 +69,3 @@ This will cause the server to send a keep alive to the client every 10 seconds.
If you then run borg commands with ``--lock-wait 600``, this gives sufficient time for the borg serve processes to terminate after the SSH connection is torn down after the 300 second wait for the keepalives to fail.
You may, of course, modify the timeout values demonstrated above to values that suit your environment and use case.