Merge lp:~javier.collado/utah/retry-timeout into lp:utah
Proposed by
Javier Collado
Status: | Merged |
---|---|
Merged at revision: | 833 |
Proposed branch: | lp:~javier.collado/utah/retry-timeout |
Merge into: | lp:utah |
Diff against target: |
264 lines (+34/-55) 9 files modified
utah/client/runner.py (+0/-3) utah/config.py (+4/-1) utah/exceptions.py (+1/-4) utah/provisioning/baremetal/bamboofeeder.py (+2/-1) utah/provisioning/baremetal/cobbler.py (+2/-2) utah/provisioning/provisioning.py (+3/-17) utah/provisioning/ssh.py (+3/-15) utah/retry.py (+19/-9) utah/url.py (+0/-3) |
To merge this branch: | bzr merge lp:~javier.collado/utah/retry-timeout |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Max Brustkern (community) | Approve | ||
Review via email:
|
Description of the change
This branch moves the different time.sleep calls in methods like `pingcheck`
and `sshcheck` to the `retry` function that is already wrapping them.
Before this change `retry` called the callable passed as argument as soon as a
retriable exception was caught and was the responsibiliy of the callable to
call `time.sleep` if needed. With this change, the `retry` takes care of that
and uses a default value from the configuration file so that callables only
need to take care of raising an exception when they fail.
To post a comment you must log in.
I see some merge conflicts. It seems weird that this and the rsyslog branch have been getting them lately. I wonder if there's been a change in launchpad that's causing this.