Merge lp://staging/~andreserl/maas/lp1598149_lp1605252 into lp://staging/~maas-committers/maas/trunk
Proposed by
Andres Rodriguez
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Andres Rodriguez | ||||||||
| Approved revision: | no longer in the source branch. | ||||||||
| Merged at revision: | 5200 | ||||||||
| Proposed branch: | lp://staging/~andreserl/maas/lp1598149_lp1605252 | ||||||||
| Merge into: | lp://staging/~maas-committers/maas/trunk | ||||||||
| Diff against target: |
199 lines (+54/-13) 5 files modified
src/maasserver/models/node.py (+10/-3) src/maasserver/node_status.py (+16/-0) src/maasserver/status_monitor.py (+18/-3) src/maasserver/tests/test_status_monitor.py (+6/-5) src/metadataserver/api.py (+4/-2) |
||||||||
| To merge this branch: | bzr merge lp://staging/~andreserl/maas/lp1598149_lp1605252 | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Blake Rouse (community) | Approve | ||
| Lee Trager (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Ensure that messages when a timeout for deploying, releasing, and commissioning happens is logged (This was supported in older releases but was dropped in 2.0).
Also, drive-by fix the commissioning monitor services. This ensures that the status_expires is not cleared when it shouldn't and allows the monitor to work while commissioning.
Another drive-by improvement, is to ensure that the monitor is only checking MACHINES and not anything else.
To post a comment you must log in.
Revision history for this message
| MAAS Lander (maas-lander) wrote | # |
Download full text (1.4 MiB)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good. Did you test that rack and region refresh still works even when they're not on the same machine?