Merge lp:~milo/linaro-patchmetrics/bug1012037 into lp:linaro-patchmetrics

[Milo Casagrande]

Hello,

I'm again proposing a small change in order to try to fix the timeout errors we have.
This small change increases the maximum git running time to 120 minutes. From local test, with a slow connection, I was getting total times of around 90 minutes. I increased the valued to have enough room for operation.

This merge also introduces small changes to the errors output.

[Deepti B. Kalakeri (deeptik)]

Looks good. +1.

review: Approve

[Milo Casagrande (milo)]

Thanks Deepti!
Will merge it right away, maybe we are able to get it deployed with the already opened RT ticket.

=== modified file 'apps/patchwork/utils.py'
--- apps/patchwork/utils.py	2012-06-21 07:18:35 +0000
+++ apps/patchwork/utils.py	2012-06-25 15:33:25 +0000
@@ -32,7 +32,7 @@
 
 
 # Timeout for git operations.
-GIT_TIMEOUT = 55 * 60
+GIT_TIMEOUT = 120 * 60
 
 
 def get_patch_ids(d, prefix='patch_id'):
@@ -207,7 +207,7 @@
     if proc.returncode is None:
         msg = "Timeout (%d/%d seconds) when fetching '%s' (%s).\n" % \
         (wait, timeout, project.name, project.linkname)
-        msg += " Project path: %s\n Project tree:%s\n" % \
+        msg += " Project path: %s\n Project tree: %s\n" % \
         (root, project.source_tree)
 
         # Kill the subprocess we started and all its children. This is
@@ -228,7 +228,7 @@
             ['kill', '-KILL'] + pids,
             stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         kill_stdout, kill_stderr = proc.communicate()
-        msg += " Stdout/stderr of the kill command: (%s, %s)." % (
+        msg += " Output of the kill command: (%s, %s)." % (
             kill_stdout, kill_stderr)
 
         # Poll the subprocess we started to ensure it's not left behind as a
@@ -243,8 +243,9 @@
     stdout, stderr = proc.communicate()
     if proc.returncode != 0:
         raise FailedToFetchGitRepo(
-            "Failed to fetch %s.\nstdout:%s\nstderr:%s" % (
-                project.source_tree, stdout, stderr))
+            "Failed to fetch %s (%s - %s).\n stdout: %s\n stderr: %s" % (
+                project.source_tree, project.name, project.linkname, stdout,
+                stderr))
 
     return root