Merge ~cjwatson/launchpad:bump-librarian-timeout into launchpad:master

[Colin Watson]

Bump default librarian client socket timeout to 15 minutes

It turns out that what I thought was a generous timeout of a minute causes problems for some scripts that upload large files, probably because the librarian storage protocol doesn't acknowledge a block at a time after the initial header but has to store the entire file first. I didn't expect that to take more than a minute, but that's what we're seeing. Since this was only ever intended as an improvement over waiting forever, bump the timeout to 15 minutes.

[Jürgen Gmach (jugmac00)]

review: Approve

diff --git a/lib/lp/services/config/schema-lazr.conf b/lib/lp/services/config/schema-lazr.conf
index c2d8b4a..89ba7bd 100644
--- a/lib/lp/services/config/schema-lazr.conf
+++ b/lib/lp/services/config/schema-lazr.conf
@@ -1261,9 +1261,11 @@ authentication_endpoint: none
 # authserver.
 authentication_timeout: 5
 
-# The timeout in seconds for librarian client socket operations.
+# The timeout in seconds for librarian client socket operations.  Note that
+# this is deliberately generous: it's intended as a backstop to ensure that
+# scripts don't get stuck waiting forever in the event of network outages.
 # datatype: integer
-client_socket_timeout: 60
+client_socket_timeout: 900
 
 
 [librarian_gc]