This repository has been archived by the owner on Sep 7, 2020. It is now read-only.
Hotfix/dev reset disconnect backhaul #1598
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When running wireless backhaul tests, we have to remove the wired interface from the bridge to avoid creating a loop. Dynamic backhaul switching is not implemented yet, but we can get away with it in certification. When we receive dev_reset_default from the UCC, remove the wired interface from the bridge. Then, when we get dev_set_config, only add the wired interface back in the bridge if the test uses wired backhaul. Signed-off-by: Raphaël Mélotte <[email protected]>
Previously the wireless hal was only disconnected in dev_reset if the FSM state was already is something that comes after ENABLE. There are some cases however where the disconnect didn't happen. For example, if the connection is active and we stop and restart prplMesh, the next dev_reset will not disconnect the wireless link. When we are in dev_reset, disconnect the wireless hal if it's active, regardless of the FSM state. Signed-off-by: Raphaël Mélotte <[email protected]>
rmelotte
requested review from
adam1985d,
arnout,
kantera800,
mariomaz,
morantr,
tomereli and
vitalybu
as code owners
mariomaz
approved these changes
Aug 13, 2020
| // remove the wired interface from the bridge, it will be added on dev_set_config. | ||
| if (std::find(bridge_ifaces.begin(), bridge_ifaces.end(), eth_iface) != | ||
| bridge_ifaces.end()) { | ||
| if (!network_utils::linux_remove_iface_from_bridge(bridge, eth_iface)) { |
There was a problem hiding this comment.
Maybe I'm wrong, but this might not be enough.
During initialization, backhaul_manager_thread reads what interfaces are in the bridge with network_utils::linux_get_iface_list_from_bridge and then configures the transport process with configure_ieee1905_transport_interfaces. Here you are removing an interface from the bridge but you are not re-configuring the transport process so it'll be unaware of the change. The same happens when you add a new interface to the bridge.
To fix this problem correctly, I think we should be monitoring the bridge for changes and automatically reconfigure the transport process, just in case the bridge is modified from outside prplMesh
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When running wireless backhaul tests, we have to remove the wired
interface from the bridge to avoid creating a loop.
Dynamic backhaul switching is not implemented yet, but we can get away
with it in certification.
When we receive dev_reset_default from the UCC, remove the wired
interface from the bridge. Then, when we get dev_set_config, only add
the wired interface back in the bridge if the test uses wired backhaul.
Also:
Previously the wireless hal was only disconnected in dev_reset if the
FSM state was already is something that comes after ENABLE.
There are some cases however where the disconnect didn't happen.
For example, if the connection is active and we stop and restart
prplMesh, the next dev_reset will not disconnect the wireless
link.
When we are in dev_reset, disconnect the wireless hal if it's active,
regardless of the FSM state.