zebra/fpm: fix shutdown and add more documentation #6253
Merged
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
polychaeta
reviewed
Apr 17, 2020
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/8f12886fa15c66c61cfe28d22d2406b7/raw/d3e1b5e78de971828505be2c614e99f61a58c364/cr_6253_1587140461.diff | git apply
diff --git a/zebra/zebra_dplane.c b/zebra/zebra_dplane.c
index 143354b16..78dfedf3f 100644
--- a/zebra/zebra_dplane.c
+++ b/zebra/zebra_dplane.c
@@ -3565,7 +3565,7 @@ void zebra_dplane_pre_finish(void)
zdplane_info.dg_is_shutdown = true;
/* Notify provider(s) of pending shutdown. */
- TAILQ_FOREACH(dp, &zdplane_info.dg_providers_q, dp_prov_link) {
+ TAILQ_FOREACH (dp, &zdplane_info.dg_providers_q, dp_prov_link) {
if (dp->dp_fini == NULL)
continue;
@@ -3892,7 +3892,7 @@ void zebra_dplane_shutdown(void)
zdplane_info.dg_master = NULL;
/* Notify provider(s) of final shutdown. */
- TAILQ_FOREACH(dp, &zdplane_info.dg_providers_q, dp_prov_link) {
+ TAILQ_FOREACH (dp, &zdplane_info.dg_providers_q, dp_prov_link) {
if (dp->dp_fini == NULL)
continue;
If you are a new contributor to FRR, please see our contributing guidelines.
mjstapp
reviewed
Apr 17, 2020
zebra/dplane_fpm_nl.c
Outdated
| close(fnc->socket); | ||
|
|
||
| /* This is the late call: stop the thread. */ | ||
| if (early == false) { |
There was a problem hiding this comment.
Hmm - maybe it's just a style nit, but I find the flow a little hard to follow. couldn't it be:
if (early) {
do early stuff
return 0;
} else {
/* it's the real end */
do final stuff
return 0;
}
There was a problem hiding this comment.
IMO that looks the same to me... I think my initial code looks cleaner since it avoids an extra indentation level. If this bothers too much, maybe I'll split it into two functions.
There was a problem hiding this comment.
another nit, please don't compare bools to true / false, just test them directly; I did a mass conversion to fix all of these a while back and would like to keep it that way
Outdated results 💚Basic BGPD CI results: SUCCESS, 0 tests failed
For details, please contact louberger |
qlyoung
requested changes
Apr 17, 2020
doc/developer/fpm.rst
Outdated
| FPM | ||
| === | ||
|
|
||
| FPM stands for Forwarding Plane Manager and it's a ``zebra``'s daemon module. |
There was a problem hiding this comment.
"it's a module for use with Zebra" or something
zebra/dplane_fpm_nl.c
Outdated
| close(fnc->socket); | ||
|
|
||
| /* This is the late call: stop the thread. */ | ||
| if (early == false) { |
There was a problem hiding this comment.
another nit, please don't compare bools to true / false, just test them directly; I did a mass conversion to fix all of these a while back and would like to keep it that way
zebra/dplane_fpm_nl.c
Outdated
| THREAD_OFF(fnc->t_ribwalk); | ||
| THREAD_OFF(fnc->t_rmacreset); | ||
| THREAD_OFF(fnc->t_rmacwalk); | ||
| if (fnc->t_read) |
There was a problem hiding this comment.
You can't test these like this, it's a race condition, just call the async cancel directly
Continuous Integration Result: FAILEDContinuous Integration Result: FAILEDSee below for issues. This is a comment from an automated CI system. Get source / Pull Request: SuccessfulBuilding Stage: SuccessfulBasic Tests: FailedTopology tests on Ubuntu 16.04 amd64: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TOPOU1604-11930/test Topology Tests failed for Topology tests on Ubuntu 16.04 amd64: see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11930/artifact/TOPOU1604/ErrorLog/log_topotests.txt Successful on other platforms/tests
Warnings Generated during build:Debian 10 amd64 build: Successful with additional warningsDebian Package lintian failed for Debian 10 amd64 build: |
Tell users about new FPM implementation and add more documentation about it. Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
Call the `dp_fini` callback twice: once at the beginning of the shutdown and then again right before `exit()`ing zebra. Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
Lets stop and free all resources before shutting down. Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
💚 Basic BGPD CI results: SUCCESS, 0 tests failedResults table
For details, please contact louberger |
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-FRRPULLREQ-11935/ This is a comment from an automated CI system. Warnings Generated during build:Debian 10 amd64 build: Successful with additional warningsDebian Package lintian failed for Debian 10 amd64 build: |
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.
Summary
Changes: