Merge lp://qastaging/~blake-rouse/maas/fix-1392865 into lp://qastaging/~maas-committers/maas/trunk
Proposed by
Blake Rouse
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Mike Pontillo | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 3977 | ||||
Proposed branch: | lp://qastaging/~blake-rouse/maas/fix-1392865 | ||||
Merge into: | lp://qastaging/~maas-committers/maas/trunk | ||||
Diff against target: |
12 lines (+1/-1) 1 file modified
src/provisioningserver/drivers/hardware/virsh.py (+1/-1) |
||||
To merge this branch: | bzr merge lp://qastaging/~blake-rouse/maas/fix-1392865 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mike Pontillo (community) | Approve | ||
Review via email: mp+260770@code.qastaging.launchpad.net |
Commit message
Remove the usage of min on the login command with the virsh power type. Use the maximum timeout set in the class.
This fixes issues where the login is slow on a remote ssh connection to virsh. Increasing the timeout fixes issues where MAAS cannot power control or power query a machine.
To post a comment you must log in.
Looks good to me.
Note that since we don't override the 'self.timeout' value in the subclass, this will use the 'self.timeout' value defined in the superclass (pexpect.spawn), which is the same as not passing in a timeout at all. (so technically this parameter could have been removed)