-
Notifications
You must be signed in to change notification settings - Fork 1.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
isisd: Update IS-IS SR Label Manager #6254
Conversation
This change modify the way IS-IS is connected to the Label Manager: - Add emission of Hello Message prior to the connection as per modification introduced by PR FRRouting#5925 - Add 'session_id' as per modification introduced by PR FRRouting#6224 - Add Doxygen documentation to Label Manager functions Signed-off-by: Olivier Dugeon <olivier.dugeon@orange.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for your contribution to FRR!
Click for style suggestions
To apply these suggestions:
curl -s https://gist.githubusercontent.com/polychaeta/7cefef416650cc8ee5e266569aa83ebb/raw/1b6a7161731d8310b676703e6d0f4c2ca358faac/cr_6254_1587145468.diff | git apply
diff --git a/isisd/isis_zebra.c b/isisd/isis_zebra.c
index d4b9d2a62..dc8b64850 100644
--- a/isisd/isis_zebra.c
+++ b/isisd/isis_zebra.c
@@ -617,14 +617,16 @@ static void isis_zebra_label_manager_connect(void)
/* Connect to label manager */
while (lm_label_manager_connect(zclient_sync, 0) != 0) {
- zlog_warn("%s: re-attempt connecting to label manager!", __func__);
+ zlog_warn("%s: re-attempt connecting to label manager!",
+ __func__);
sleep(1);
}
label_chunk_list = list_new();
label_chunk_list->del = isis_zebra_del_label_chunk;
while (isis_zebra_get_label_chunk() != 0) {
- zlog_warn("%s: re-attempt getting first label chunk!", __func__);
+ zlog_warn("%s: re-attempt getting first label chunk!",
+ __func__);
sleep(1);
}
}
If you are a new contributor to FRR, please see our contributing guidelines.
Create a new PR because the dev_isis_sr branch had to be rebased first. |
zlog_warn( | ||
"%s: re-attempt sending hello for synchronous zclient!", | ||
__func__); | ||
sleep(1); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Doing this means we don't respond to vtysh or watchfrr pings, which can result in watchfrr assuming isisd has died, with bad consequences. A thread timer would be better.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@qlyoung Agree, but we need to also update ldpd and ospfd accordingly. Can you provide a example of thread timer ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've opened PR #6274 with an example for ldpd. But really, just because ldpd does a bad thing doesn't mean that isis can't do better, eh?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@odd22 I'm referring to thread_add_timer
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-11932/ This is a comment from an automated CI system. Warnings Generated during build:Checkout code: Successful with additional warnings
Warnings Generated during build:Debian 10 amd64 build: Successful with additional warningsDebian Package lintian failed for Debian 10 amd64 build:
|
Merge this PR as per decision during the last Telco meeting in order to prepare ISIS-SR inclusion in master. Label Manager will be definitely solved in another PR. |
This change modify the way IS-IS is connected to the Label Manager:
modification introduced by PR zebra: synchronous client queues accumulate messages from zebra #5925
Signed-off-by: Olivier Dugeon olivier.dugeon@orange.com