Merge lp:~jtv/launchpad/bug-623865 into lp:launchpad

Proposed by Jeroen T. Vermeulen on 2010-08-25
Status: Merged
Merged at revision: 11440
Proposed branch: lp:~jtv/launchpad/bug-623865
Merge into: lp:launchpad
Diff against target: 33 lines (+6/-5)
2 files modified
lib/lp/translations/model/translationtemplatesbuildjob.py (+4/-3)
lib/lp/translations/tests/test_translationtemplatesbuildjob.py (+2/-2)
To merge this branch: bzr merge lp:~jtv/launchpad/bug-623865
Reviewer Review Type Date Requested Status
Данило Шеган (community) production-change 2010-08-25 Approve on 2010-08-25
Julian Edwards (community) 2010-08-25 Approve on 2010-08-25
Review via email: mp+33617@code.launchpad.net

Commit Message

Raise TranslationTemplatesBuildJob priority.

Description of the Change

= Bug 623865 =

Our TranslationTemplateBuildFarmJobs have been starved out of the build farm since Friday morning. This raises new jobs' priority a bit, as per discussion with bigjools.

To test:
{{{
./bin/test -vvc -m lp.translations.tests.test_translationtemplatesbuildfarmjob
}}}

To Q/A, confirm that these jobs are being processed. One way of doing it is to run this against the production db: http://paste.ubuntu.com/482149/

…and verifying that accumulation of jobs in status 0 ("waiting") does not continue. The older jobs will probably stick around for a while as they still have the older priority of 1000.

No lint.

Jeroen

To post a comment you must log in.
review: Approve
Данило Шеган (danilo) wrote :

Don't forget to update the comment in the test which mentions "1,000" (at least when landing on devel).

review: Approve (production-change)
Jeroen T. Vermeulen (jtv) wrote :

Thanks for the approval, and the comment gotcha!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/translations/model/translationtemplatesbuildjob.py'
2--- lib/lp/translations/model/translationtemplatesbuildjob.py 2010-08-20 20:31:18 +0000
3+++ lib/lp/translations/model/translationtemplatesbuildjob.py 2010-08-25 11:11:02 +0000
4@@ -69,9 +69,10 @@
5
6 def score(self):
7 """See `IBuildFarmJob`."""
8- # Hard-code score for now; anything other than 1000 is probably
9- # inappropriate.
10- return 1000
11+ # Hard-code score for now. Most PPA jobs start out at 2505;
12+ # TranslationTemplateBuildJobs are fast so we want them at a
13+ # higher priority.
14+ return 2510
15
16 def getLogFileName(self):
17 """See `IBuildFarmJob`."""
18
19=== modified file 'lib/lp/translations/tests/test_translationtemplatesbuildjob.py'
20--- lib/lp/translations/tests/test_translationtemplatesbuildjob.py 2010-08-20 20:31:18 +0000
21+++ lib/lp/translations/tests/test_translationtemplatesbuildjob.py 2010-08-25 11:11:02 +0000
22@@ -117,9 +117,9 @@
23 self.specific_job.getLogFileName(), other_job.getLogFileName())
24
25 def test_score(self):
26- # For now, these jobs always score themselves at 1,000. In the
27+ # For now, these jobs always score themselves at 2510. In the
28 # future however the scoring system is to be revisited.
29- self.assertEqual(1000, self.specific_job.score())
30+ self.assertEqual(2510, self.specific_job.score())
31
32 def test_cleanUp(self):
33 # TranslationTemplatesBuildJob has its own customized cleanup