launchpad-reviewers team mailing list archive

[Enrique Sánchez <mp+492717@xxxxxxxxxxxxxxxxxx>]

Enrique Sánchez has proposed merging ~enriqueesanchz/launchpad:fix-soft-time-limit-importvulnerabilityjob into launchpad:master.

Commit message:
Increase soft_time_limit ImportVulnerabilityJob
    
When ImportVulnerabilityJob does a full import takes more than the 300s
soft time limit. As it will work in the launchpad_job_slow queue we
increase this limit to 2 hours since a full SVT import takes less right
now.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~enriqueesanchz/launchpad/+git/launchpad/+merge/492717
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~enriqueesanchz/launchpad:fix-soft-time-limit-importvulnerabilityjob into launchpad:master.

diff --git a/lib/lp/bugs/model/importvulnerabilityjob.py b/lib/lp/bugs/model/importvulnerabilityjob.py
index 2b391cb..951e8fc 100644
--- a/lib/lp/bugs/model/importvulnerabilityjob.py
+++ b/lib/lp/bugs/model/importvulnerabilityjob.py
@@ -7,6 +7,7 @@ __all__ = [
 
 import logging
 import re
+from datetime import timedelta
 
 from zope.component import getUtility
 from zope.interface import implementer, provider
@@ -51,8 +52,13 @@ class ImportVulnerabilityJob(VulnerabilityJobDerived):
 
     user_error_types = (VulnerabilityJobException,)
 
+    # This is a known slow task that will exceed the timeouts for
+    # the normal job queue, so put it on a queue with longer timeouts
     task_queue = "launchpad_job_slow"
 
+    soft_time_limit = timedelta(minutes=120)
+    lease_duration = timedelta(minutes=120)
+
     config = config.IImportVulnerabilityJobSource
 
     @property