launchpad-reviewers team mailing list archive

[William Grant <me@xxxxxxxxxxxxxxxxxx>]

William Grant has proposed merging lp:~wgrant/launchpad/bug-1502748 into lp:launchpad.

Commit message:
Increase GitHostingClient timeout, as detect-merges can be quite slow on large repos.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1502748 in Launchpad itself: "GitHostingClient timeout too low to detect merges on large repos"
  https://bugs.launchpad.net/launchpad/+bug/1502748

For more details, see:
https://code.launchpad.net/~wgrant/launchpad/bug-1502748/+merge/273366

Increase GitHostingClient timeout, as detect-merges can be quite slow on large repos.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/bug-1502748 into lp:launchpad.

=== modified file 'lib/lp/code/model/githosting.py'
--- lib/lp/code/model/githosting.py	2015-07-08 16:05:11 +0000
+++ lib/lp/code/model/githosting.py	2015-10-05 06:03:04 +0000
@@ -44,7 +44,7 @@
         # XXX cjwatson 2015-03-01: The hardcoded timeout at least means that
         # we don't lock tables indefinitely if the hosting service falls
         # over, but is there some more robust way to do this?
-        return 5.0
+        return 30.0
 
     def _request(self, method, path, json_data=None, **kwargs):
         session = self._makeSession()