Merge lp://staging/~julian-edwards/maas/1.7-race-for-staticip-bug-1387262 into lp://staging/~maas-committers/maas/trunk
Proposed by
Julian Edwards
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~julian-edwards/maas/1.7-race-for-staticip-bug-1387262 |
| Merge into: | lp://staging/~maas-committers/maas/trunk |
| Diff against target: |
2560 lines (+1719/-477) (has conflicts) 17 files modified
Makefile (+2/-2) docs/changelog.rst (+937/-466) src/maasserver/api/tests/test_node.py (+6/-1) src/maasserver/forms_settings.py (+10/-0) src/maasserver/models/config.py (+1/-0) src/maasserver/models/node.py (+162/-0) src/maasserver/models/tests/test_bootsource.py (+4/-0) src/maasserver/models/tests/test_node.py (+417/-0) src/maasserver/tests/test_bootresources.py (+19/-0) src/maasserver/views/nodes.py (+5/-0) src/maasserver/views/tests/test_nodes.py (+54/-0) src/metadataserver/api.py (+17/-3) src/metadataserver/models/commissioningscript.py (+22/-5) src/metadataserver/models/tests/test_noderesults.py (+27/-0) src/metadataserver/tests/test_api.py (+15/-0) src/provisioningserver/rpc/boot_images.py (+14/-0) src/provisioningserver/rpc/tests/test_boot_images.py (+7/-0) Text conflict in docs/changelog.rst Text conflict in src/maasserver/api/tests/test_node.py Text conflict in src/maasserver/models/node.py Text conflict in src/maasserver/models/tests/test_node.py Text conflict in src/maasserver/tests/test_bootresources.py Text conflict in src/maasserver/views/nodes.py Text conflict in src/maasserver/views/tests/test_nodes.py Text conflict in src/metadataserver/api.py Text conflict in src/provisioningserver/rpc/boot_images.py |
| To merge this branch: | bzr merge lp://staging/~julian-edwards/maas/1.7-race-for-staticip-bug-1387262 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Julian Edwards (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Backport trunk r3337: Use a lock in the critical section of the code that finds and records a new static IP address in the database. Some users have reported errors in the PG log file complaining about inserting duplicates, so there must be a race.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Approved for a backport by Andres earlier in the bug.