Launchpad itself

Merge ~twom/launchpad:tasks-some-speedy-some-slow into launchpad:master

Proposed by Tom Wardill on 2021-05-18

Status:	Merged
Approved by:	Tom Wardill on 2021-05-20
Approved revision:	fb58fd0d723fd4d6b2de36c7e789dd7e337d9b70
Merge reported by:	Otto Co-Pilot
Merged at revision:	not available
Proposed branch:	~twom/launchpad:tasks-some-speedy-some-slow
Merge into:	launchpad:master
Diff against target:	119 lines (+59/-4) 4 files modified lib/lp/services/job/celeryconfig.py (+1/-3) lib/lp/services/job/celeryjob.py (+4/-0) lib/lp/services/job/runner.py (+7/-1) lib/lp/services/job/tests/test_celery.py (+47/-0)
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Colin Watson (community)		2021-05-18	Approve on 2021-05-18
Review via email: mp+402919@code.staging.launchpad.net

Commit message

Enable slow lane fallback in celery

Description of the change

* Use the correct key
* Don't re-queue the same task _and_ the slow lane task
* Add a test to ensure we're queueing correctly

Revision history for this message

Colin Watson (cjwatson) on 2021-05-18:

review: Approve

Revision history for this message

Tom Wardill (twom) wrote on 2021-05-19:

This currently breaks a lot of celery related job tests:

lp.oci.tests.test_ocirecipebuildjob.TestOCIRegistryUploadJobViaCelery.test_run_upload
ValueError: expected txn status 'Active' or 'Doomed', but it's 'Committed'

Revision history for this message

Tom Wardill (twom) wrote on 2021-05-19:

> This currently breaks a lot of celery related job tests:
>
> lp.oci.tests.test_ocirecipebuildjob.TestOCIRegistryUploadJobViaCelery.test_run
> _upload
> ValueError: expected txn status 'Active' or 'Doomed', but it's 'Committed'

Fixed by not importing celery_app at module level.

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.