Merge lp:~rvb/maas/bug-1384001-redux-2 into lp:~maas-committers/maas/trunk
Status: | Merged |
---|---|
Approved by: | Raphaël Badin |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3305 |
Proposed branch: | lp:~rvb/maas/bug-1384001-redux-2 |
Merge into: | lp:~maas-committers/maas/trunk |
Diff against target: |
49 lines (+20/-1) 2 files modified
src/maasserver/middleware.py (+7/-1) src/maasserver/tests/test_middleware.py (+13/-0) |
To merge this branch: | bzr merge lp:~rvb/maas/bug-1384001-redux-2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gavin Panella (community) | Approve | ||
Christian Reis (community) | Approve | ||
Graham Binns (community) | Approve | ||
Review via email: mp+239855@code.launchpad.net |
Commit message
When node.wait_
Description of the change
This is a minimal fix that I'm doing so that a 503 response is returned when a power action is already in progress. Turns out node.wait_
I'm planning to backport this to 1.7 and this is why this change is minimal: a more thorough cleanup is in progress (to completely get rid of MutlipleFailures) but we will land it only on trunk.
Additionally, this raises the default waiting time to 10 seconds: since this is a default we apply to any operation, it's probably best to be on the safe side; when this done on a pre-exception (and thus per-power type) basis, we will use something more fine-grained.
Approved for 1.7 and trunk.