fix 'exit' bug in config file processing, et al. (backport #13763) #13834
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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
We need to ignore SIGHUP rather than reload config now. Signed-off-by: Christian Hopps <chopps@labn.net> (cherry picked from commit f7a2c2a)
This is required to make sure that we properly send the XFRR_end_configuration tag to the daemons. Previously if the user had an `exit` at the root level the parser would just drop out of the config node and so XFRR_end_configuration, even if sent, would be ignored Signed-off-by: Christian Hopps <chopps@labn.net> (cherry picked from commit 315e903)
Avoid recursion into vty_close() when being notified of a session closure that happened inside vty_close(). If a vty is closed with outstanding config yet to be commited issue a warning that it is being lost. Signed-off-by: Christian Hopps <chopps@labn.net> (cherry picked from commit 4307fdd)
For creation this is the first thing done so short-circuit just means inline sync response. However, for destroy there could be commands in-flight, these will be discarded when they match no session, and the state cleaned up immediately when the message short-circuits. Signed-off-by: Christian Hopps <chopps@labn.net> (cherry picked from commit 0fc08fa)
Signed-off-by: Christian Hopps <chopps@labn.net> (cherry picked from commit f0fa4c0)
Signed-off-by: Christian Hopps <chopps@labn.net> (cherry picked from commit 79d4097)
Testing early exits/ends from config files loaded with `vtysh -f cfgfile` as well as `vtysh < cfgfile`, verify the same as non-mgmtd behavior. Signed-off-by: Christian Hopps <chopps@labn.net> (cherry picked from commit dac48df)
Continuous Integration Result: SUCCESSFULCongratulations, this patch passed basic tests Tested-by: NetDEF / OpenSourceRouting.org CI System CI System Testrun URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-12476/ This is a comment from an automated CI system. |
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.
This is an automatic backport of pull request #13763 done by Mergify.
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com