Merge lp:~gmb/maas/backport-fix-power-action-waiting-time-bug-1384758-1.7 into lp:maas/1.7

Proposed by Graham Binns
Status: Merged
Approved by: Graham Binns
Approved revision: no longer in the source branch.
Merged at revision: 3281
Proposed branch: lp:~gmb/maas/backport-fix-power-action-waiting-time-bug-1384758-1.7
Merge into: lp:maas/1.7
Diff against target: 24 lines (+2/-2)
2 files modified
src/provisioningserver/rpc/power.py (+1/-1)
src/provisioningserver/rpc/tests/test_power.py (+1/-1)
To merge this branch: bzr merge lp:~gmb/maas/backport-fix-power-action-waiting-time-bug-1384758-1.7
Reviewer Review Type Date Requested Status
Christian Reis (community) Approve
Review via email: mp+239719@code.launchpad.net

Commit message

Update the default waiting policy for power actions so as to allow for BMCs that become unresponsive for several seconds whilst carrying out the power action.

Backported to 1.7 from trunk r 3302.

To post a comment you must log in.
Revision history for this message
Christian Reis (kiko) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/provisioningserver/rpc/power.py'
2--- src/provisioningserver/rpc/power.py 2014-10-06 11:02:29 +0000
3+++ src/provisioningserver/rpc/power.py 2014-10-27 12:19:10 +0000
4@@ -147,7 +147,7 @@
5 yield send_event_node(event_type, system_id, hostname)
6
7
8-default_waiting_policy = (1, 1, 1, 1, 1, 3, 5)
9+default_waiting_policy = (1, 2, 2, 4, 6, 8, 12)
10
11
12 @asynchronous
13
14=== modified file 'src/provisioningserver/rpc/tests/test_power.py'
15--- src/provisioningserver/rpc/tests/test_power.py 2014-10-06 11:02:29 +0000
16+++ src/provisioningserver/rpc/tests/test_power.py 2014-10-27 12:19:10 +0000
17@@ -401,7 +401,7 @@
18 call(1, reactor), # pause(1, reactor)
19 call(power_change='query', **context),
20 call(power_change=power_change, **context),
21- call(1, reactor), # pause(1, reactor)
22+ call(2, reactor), # pause(1, reactor)
23 call(power_change='query', **context),
24 ))
25

Subscribers

People subscribed via source and target branches

to all changes: