Merge lp:~rvb/maas/bug-1442059 into lp:~maas-committers/maas/trunk

[Raphaël Badin]

Set the timeout used by twisted to cancel the power action to 5 minutes. There is already a timeout that depends on the retry policy (how power actions are retried at the Python level) and what the power template does. In the case of AMT, where the template itself does some retrying, the original timeout of 2 minutes wasn't enough (yes, AMT is that flaky).

Another fix would have been to watch the PXE requests and immediately mark the power action as successful when the node MAAS is trying to power up PXE boots. I decided against it because this is both racy and involved (it would tie together two fairly independent systems in MAAS: the power mechanism and the PXE request endpoint).

When we port the power templates to Python, we can rationalize how we deal with timeouts: right now each layer has its own timeout.

[Gavin Panella (allenap)]

review: Approve

=== modified file 'src/provisioningserver/rpc/power.py'
--- src/provisioningserver/rpc/power.py	2015-04-01 11:44:04 +0000
+++ src/provisioningserver/rpc/power.py	2015-04-22 09:29:14 +0000
@@ -77,9 +77,9 @@
 ]
 
 
-# Timeout for change_power_state(). We set it to 2 minutes by default,
+# Timeout for change_power_state(). We set it to 5 minutes by default,
 # but it would be lovely if this was configurable.
-CHANGE_POWER_STATE_TIMEOUT = timedelta(minutes=2).total_seconds()
+CHANGE_POWER_STATE_TIMEOUT = timedelta(minutes=5).total_seconds()
 
 
 maaslog = get_maas_logger("power")