GitHostingClient timeout too low to detect merges on large repos

Bug #1502748 reported by Alex Tu on 2015-10-05
8
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Launchpad itself
Critical
William Grant

Bug Description

We use launchpad to host our git repositories.
And sometimes the "Preview Diff" in merge proposal give us the incorrect information, it compared incorrect pair of commits.
ex. https://code.launchpad.net/~alextu/jiexi/+git/kernel_msm-3.10/+merge/273206

It compared 3fada00 and b0e0dbe, but it should compare 3fada00 and 9e58f51.

Here is some more information about the whole tree:
http://paste.ubuntu.com/12687282/

Related branches

Alex Tu (alextu) on 2015-10-05
description: updated
William Grant (wgrant) on 2015-10-05
summary: - [git]Preview Diff in merge proposal compared incorrect pair of commits.
+ GitRef commit information can get out of date

From OOPS-6cf25eda7581ff87dd17edb3da352e80 (already expired):

GitRepositoryScanFault: Failed to detect merges in Git repository: HTTPConnectionPool(host='git.launchpad.net', port=19417): Read timed out. (read timeout=5.0)

Five seconds is quite optimistic for a kernel merge.

summary: - GitRef commit information can get out of date
+ GitHostingClient timeout too low to detect merges on large repos
Changed in launchpad:
importance: Undecided → Critical
status: New → Triaged
tags: added: git oops
William Grant (wgrant) on 2015-10-05
Changed in launchpad:
assignee: nobody → William Grant (wgrant)
status: Triaged → In Progress
Launchpad QA Bot (lpqabot) wrote :
tags: added: qa-needstesting
Changed in launchpad:
status: In Progress → Fix Committed
Colin Watson (cjwatson) wrote :

I haven't specifically QAed a timeout case, but ordinary merge detection still works.

tags: added: qa-ok
removed: qa-needstesting
Colin Watson (cjwatson) on 2015-10-05
Changed in launchpad:
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers