Merge lp:~jtv/maas/defer-task-logger into lp:~maas-committers/maas/trunk
Proposed by
Jeroen T. Vermeulen
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Jeroen T. Vermeulen | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 1353 | ||||
Proposed branch: | lp:~jtv/maas/defer-task-logger | ||||
Merge into: | lp:~maas-committers/maas/trunk | ||||
Diff against target: |
352 lines (+63/-40) 6 files modified
src/provisioningserver/boot_images.py (+4/-4) src/provisioningserver/dhcp/leases.py (+4/-4) src/provisioningserver/start_cluster_controller.py (+18/-9) src/provisioningserver/tags.py (+19/-16) src/provisioningserver/tests/test_start_cluster_controller.py (+8/-1) src/provisioningserver/tests/test_tags.py (+10/-6) |
||||
To merge this branch: | bzr merge lp:~jtv/maas/defer-task-logger | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gavin Panella (community) | Approve | ||
Review via email: mp+134679@code.launchpad.net |
Commit message
Defer celery imports in pserv that may load config and issue warnings.
Description of the change
Discussed the details with Gavin. This avoids problems with maas-provision importing celery modules that, as a side effect, try to read celeryconfig.py. That module is not always available, e.g. on a dev system, or on a cluster controller that isn't also a region controller where celery hasn't been told to load the right config module, so that it may output inappropriate warnings.
Ultimately the start_cluster_
Jeroen
To post a comment you must log in.
On 17/11/12 00:59, Jeroen T. Vermeulen wrote: controller command will still need the problematic celery imports
> Ultimately the start_cluster_
Why? start_cluster_ controller is not a task and has nothing to do with
celery (other than execing a celery daemon).