Merge lp:~allenap/maas/reload-boot-images-without-holding-config-lock--1.9 into lp:maas/1.9
Proposed by
Gavin Panella
Status: | Merged |
---|---|
Approved by: | Gavin Panella |
Approved revision: | no longer in the source branch. |
Merged at revision: | 4526 |
Proposed branch: | lp:~allenap/maas/reload-boot-images-without-holding-config-lock--1.9 |
Merge into: | lp:maas/1.9 |
Diff against target: |
81 lines (+19/-13) 2 files modified
src/maasserver/models/tests/test_interface.py (+17/-12) src/provisioningserver/rpc/boot_images.py (+2/-1) |
To merge this branch: | bzr merge lp:~allenap/maas/reload-boot-images-without-holding-config-lock--1.9 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gavin Panella (community) | Approve | ||
Review via email: mp+279993@code.launchpad.net |
Commit message
Don't hold the cluster configuration lock while reloading boot images.
From inspection, this was the single remaining operation left in MAAS's code base that does something that might possibly be slow whilst also holding the configuration lock.
This also fixes some unrelated flaky tests which were preventing landing.
To post a comment you must log in.
The attempt to merge lp:~allenap/maas/reload-boot-images-without-holding-config-lock--1.9 into lp:maas/1.9 failed. Below is the output from the failed tests.
Ign http:// prodstack- zone-2. clouds. archive. ubuntu. com trusty InRelease security. ubuntu. com trusty-security InRelease [64.4 kB] prodstack- zone-2. clouds. archive. ubuntu. com trusty-updates InRelease [64.4 kB] prodstack- zone-2. clouds. archive. ubuntu. com trusty-backports InRelease prodstack- zone-2. clouds. archive. ubuntu. com trusty Release.gpg prodstack- zone-2. clouds. archive. ubuntu. com trusty Release security. ubuntu. com trusty- security/ main Sources [101 kB] security. ubuntu. com trusty- security/ universe Sources [31.9 kB] security. ubuntu. com trusty- security/ main amd64 Packages [382 kB] prodstack- zone-2. clouds. archive. ubuntu. com trusty-updates/main Sources [247 kB] prodstack- zone-2. clouds. archive. ubuntu. com trusty- updates/ restricted Sources [5,359 B] security. ubuntu. com trusty- security/ universe amd64 Packages [120 kB] prodstack- zone-2. clouds. archive. ubuntu. com trusty- updates/ universe Sources [144 kB] security. ubuntu. com trusty- security/ main Translation-en [208 kB] prodstack- zone-2. clouds. archive. ubuntu. com trusty- updates/ multiverse Sources [5,167 B] prodstack- zone-2. clouds. archive. ubuntu. com trusty-updates/main amd64 Packages [665 kB] security. ubuntu. com trusty- security/ universe Translation-en [70.1 kB] prodstack- zone-2. clouds. archive. ubuntu. com trusty- updates/ restricted amd64 Packages [15.9 kB] prodstack- zone-2. clouds. archive. ubuntu. com trusty- updates/ universe amd64 Packages [329 kB] prodstack- zone-2. clouds. archive. ubuntu. com trusty- updates/ multiverse amd64 Packages [13.0 kB] prodstack- zone-2. clouds. archive. ubuntu. com trusty-updates/main Translation-en [329 kB] prodstack- zone-2. clouds. archive. ubuntu. com trusty- updates/ multiverse Translation-en [6,832 B] prodstack- zone-2. clouds. archive. ubuntu. com trusty- updates/ restricted Translation-en [3,699 B] prodstack- zone-2. clouds. archive. ubuntu. com trusty- updates/ universe Translation-en [173 kB] prodstack- zone-2. clouds. archive. ubuntu. com trusty- backports/ main Sources prodstack- zone-2. clouds. archive. ubuntu. com trusty- backports/ restricted Sources prodstack- zone-2. clouds. archive. ubuntu. com trusty- backports/ universe Sources prodstack- zone-2. clouds. archive. ubuntu. com trusty- backports/ multiverse Sources prodstack- zone-2. clouds. archive. ubuntu. com trusty- backports/ main amd64 Packages prodstack- zone-2. clouds. archive. ubuntu. com trusty- backports/ restricted amd64 Packages prodstack- zone-2. clouds. archive. ubuntu. com trusty- backports/ universe amd64 Packages prodstack- zone-2. clouds. archive. ubuntu. com trusty- backports/ multiverse amd64 Packages prodstack- zone-2. clouds. archive. ubuntu. com trusty- backports/ main Translation-en prodstack- zone-2. clouds. archive. ubuntu. com trust...
Get:1 http://
Get:2 http://
Hit http://
Hit http://
Hit http://
Get:3 http://
Get:4 http://
Get:5 http://
Get:6 http://
Get:7 http://
Get:8 http://
Get:9 http://
Get:10 http://
Get:11 http://
Get:12 http://
Get:13 http://
Get:14 http://
Get:15 http://
Get:16 http://
Get:17 http://
Get:18 http://
Get:19 http://
Get:20 http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://