[JIRA] [git-plugin] (JENKINS-32143) Set git merge timeout

[ryazansev.dmitry@yandex.ru (JIRA)]

Dmitry Ryazancev created an issue

Jenkins / JENKINS-32143 Set git merge timeout Issue Type: New Feature Assignee: Mark Waite Components: git-plugin Created: 18/Dec/15 10:19 AM Environment: windows Priority: Trivial Reporter: Dmitry Ryazancev When using Merge Before Build, sometimes throws error: git merge --ff df24f37fedf6048881cc0683a782c975b0bd8db7 # timeout=10 ERROR: Timeout after 10 minutes > git config core.sparsecheckout # timeout=10 > git checkout -f df24f37fedf6048881cc0683a782c975b0bd8db7 # timeout=20 FATAL: Could not lock repository. Please try again and next build in the same workspace is failed with error: FATAL: Could not lock repository. Please try again This happens because my repositore is very big. I want set a merge timeout or kill git process before next try. Thanks Add Comment

This message was sent by Atlassian JIRA (v6.4.2#64017-sha1:e244265)

[mark.earl.waite@gmail.com (JIRA)]

Mark Waite assigned an issue to Unassigned

Jenkins / JENKINS-32143 Set git merge timeout

Change By: Mark Waite Assignee: Mark Waite

Add Comment

[ryazansev.dmitry@yandex.ru (JIRA)]

Dmitry Ryazancev updated an issue

Jenkins / JENKINS-32143 Set git merge timeout

Change By: Dmitry Ryazancev Component/s: git-client-plugin

Add Comment

[sladynnunes98@gmail.com (JIRA)]

Sladyn Nunes assigned an issue to Sladyn Nunes

Jenkins / JENKINS-32143 Set git merge timeout

Change By: Sladyn Nunes Assignee: Sladyn Nunes

Add Comment

This message was sent by Atlassian Jira (v7.13.6#713006-sha1:cc4451f)

[sladynnunes98@gmail.com (JIRA)]

Sladyn Nunes commented on JENKINS-32143

Re: Set git merge timeout With respect to this issue from a bit of research I suppose the changes are to be made to `PreBuildMerge.java` and my question is would we set the timeout just before the merge happens so that the process does not give an error or do we want to check if the merge has failed due to timeout by storing it in the `BuildData` and killing the process so that a new merge is attempted with a changed timeout.

Add Comment

[mark.earl.waite@gmail.com (JIRA)]

Mark Waite commented on JENKINS-32143

Re: Set git merge timeout

I think we should keep it consistent with other timeout implementations. They configure a timeout on the command line git process and abort the command if it has not completed before the timeout expires.

Add Comment

[mark.earl.waite@gmail.com (JIRA)]

Mark Waite updated JENKINS-32143

Jenkins / JENKINS-32143 Set git merge timeout

Change By: Mark Waite Status: In Progress Review

Add Comment

[mark.earl.waite@gmail.com (JIRA)]

Mark Waite started work on JENKINS-32143

Change By: Mark Waite Status: Open In Progress

Add Comment