zebra: bugfix of error quit of zebra, due to no nexthop ACTIVE (backport #9214) #9275
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}
There exists some rare situations where fpm will attempt to send a route update with no valid nexthops. In that case an assert would be hit. This is not good for trying to keep your routing daemons up and running when we can safely just recover the situation. Fixes #7588 Signed-off-by: batmancn <[email protected]> <fixed commit message, and used zlog_err> Signed-off-by: Donald Sharp <[email protected]> (cherry picked from commit 5306e6c)
polychaeta
reviewed
Aug 3, 2021
There was a problem hiding this comment.
Thanks for your contribution to FRR!
Click for style suggestions
To apply these suggestions:
curl -s https://gist.githubusercontent.com/polychaeta/d40f6d593e2ae0d9ae96ba97ff6beb38/raw/136a4d85206c49823240d7df7a2b6f215c4f8a94/cr_9275_1628023896.diff | git apply
diff --git a/zebra/zebra_fpm.c b/zebra/zebra_fpm.c
index 855e19dc45..ea20bf785e 100644
--- a/zebra/zebra_fpm.c
+++ b/zebra/zebra_fpm.c
@@ -1013,8 +1013,9 @@ static int zfpm_build_route_updates(void)
else
zfpm_g->stats.route_dels++;
} else {
- zlog_err("%s: Encoding Prefix: %pRN No valid nexthops",
- __func__, dest->rnode);
+ zlog_err(
+ "%s: Encoding Prefix: %pRN No valid nexthops",
+ __func__, dest->rnode);
}
}
If you are a new contributor to FRR, please see our contributing guidelines.
After making changes, you do not need to create a new PR. You should perform an amend or interactive rebase followed by a force push.
💚 Basic BGPD CI results: SUCCESS, 0 tests failedResults table
For details, please contact louberger |
Continuous Integration Result: FAILEDTest incomplete. See below for issues. This is a comment from an automated CI system. Get source / Pull Request: SuccessfulBuilding Stage: SuccessfulBasic Tests: IncompleteTopotests Ubuntu 18.04 amd64 part 8: Incomplete(check logs for details)Topotests Ubuntu 18.04 amd64 part 8: Incomplete(check logs for details)Topotests Ubuntu 18.04 i386 part 8: Incomplete(check logs for details)Successful on other platforms/tests
|
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 #9214 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.io/