Merge lp:~rodsmith/checkbox/network-fixes into lp:checkbox
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Daniel Manrique | ||||
Approved revision: | 3155 | ||||
Merged at revision: | 3155 | ||||
Proposed branch: | lp:~rodsmith/checkbox/network-fixes | ||||
Merge into: | lp:checkbox | ||||
Diff against target: |
201 lines (+66/-25) 1 file modified
providers/plainbox-provider-checkbox/bin/network (+66/-25) |
||||
To merge this branch: | bzr merge lp:~rodsmith/checkbox/network-fixes | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Manrique (community) | Approve | ||
Zygmunt Krynicki (community) | Needs Fixing | ||
Review via email: mp+228923@code.launchpad.net |
Commit message
Fixes problems with failing network tests and trashed routing tables in network tests.
Description of the change
Fixes for bug 1329029:
First, the script now tries to ping the iperf or FTP server for up to four minutes before proceeding. It does not proceed with tests until the server begins responding to pings. If the server doesn't respond to pings after ~4 minutes, the tests fail. This resolves problems with some smart switches, which can be sluggish to restore connections when they're restored via "ip link set dev eth0 up" (or similar for other interfaces). The original script used a 10-second pause, which is inadequate in these cases. Note that if the config file lacks an IP address for the test server, this will add a ~4-minute delay to each NIC's test time. (The tests would fail either way, of course; only the extra delay is new.)
Second, the script now saves the routing table (via "ip route save table all") to a temporary file (/tmp/plainbox-
This all looks good, I suggested a few improvements but they are just style fixes, which I think would be nice to have but not mandatory. Let me know, if you're pressed for time we can merge as-is.