Add cleanup action for cleaning up after a device is removed #156
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 rewinding the ipt log we should always restart it, so make the restart part of the rewind function instead of having the caller call both. Signed-off-by: Toke Høiland-Jørgensen <[email protected]>
We're removing the IFB interface anyway, which means that the qdisc will go with it, so there's no reason to explicitly remove the qdisc first. Signed-off-by: Toke Høiland-Jørgensen <[email protected]>
If DOWNLINK is set to 0, we didn't remove the egress qdisc either. Fix that to unconditionally remove the egress qdisc, and only condition the removal of the ingress qdisc. Signed-off-by: Toke Høiland-Jørgensen <[email protected]>
Split out the cleaning of iptables rules and IFB interface to a separate sqm_cleanup() function, which can optionally be called with a "silent" parameter which will silence the IFB removal command. This is in preparation for exposing this as a separate cleanup action that can be called after the main netdevice is removed. Signed-off-by: Toke Høiland-Jørgensen <[email protected]>
If a network interface is removed before SQM is stopped on that interface, removing the qdisc from that interface will result in errors in the log. Whereas not running the 'stop' action will result in leftover state files (and possibly an IFB interface). While the right thing to do would be to stop SQM before removing the interface, this is not always possible; for instance, pppd doesn't have a 'pre-down' hook. So to accommodate this use case, add a new 'cleanup' action, which just unwinds the firewall rules, removes the IFB interface (but silently in case it does not exist), and deletes the state file. Signed-off-by: Toke Høiland-Jørgensen <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Add a new 'cleanup' action for cleaning up SQM state after an interface that has
gone away. Refactor the stop code a bit in the process, most notably to fix
stopping in the case where no downstream shaper is configured.
Fixes #155.