Merge lp:~blake-rouse/maas/fix-1680278 into lp:~maas-committers/maas/trunk
Proposed by
Blake Rouse
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Blake Rouse | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 5979 | ||||
Proposed branch: | lp:~blake-rouse/maas/fix-1680278 | ||||
Merge into: | lp:~maas-committers/maas/trunk | ||||
Diff against target: |
244 lines (+99/-27) 2 files modified
src/metadataserver/api_twisted.py (+68/-22) src/metadataserver/tests/test_api_twisted.py (+31/-5) |
||||
To merge this branch: | bzr merge lp:~blake-rouse/maas/fix-1680278 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Lee Trager (community) | Approve | ||
Review via email:
|
Commit message
Update the last_ping for the script_set in its own transaction. Only update if the timestamp is later in time and only the latest message in the queue for that node. Uses select_for_update to remove the chance on conflicts.
To post a comment you must log in.
Still need to do the unit tests. But I ran this with 9 VMs on my machine (which makes it out) and all deployed successfully with no issues or tracebacks.