-
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
ospfd:reset wait timer when reading ip ospf dead-interval #16954
base: master
Are you sure you want to change the base?
Conversation
7a02698
to
2a4954f
Compare
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.
Please provide a simpler solution that doesn't add so much unnecessary code and doesn't reset timers unless it actually changes.
2a4954f
to
9b0310e
Compare
9b0310e
to
3a0a803
Compare
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.
Please fix Verify Source
(check) issues.
3a0a803
to
bb25e3c
Compare
bb25e3c
to
c9dc6ce
Compare
ok |
c9dc6ce
to
9479514
Compare
@aceelindem is it good now? |
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.
looks good
I think we're waiting on blocking changes from @aceelindem ? |
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 moving this code. See comments regarding the setting of reset_wait_time.
@@ -8103,6 +8105,32 @@ static int ospf_vty_dead_interval_set(struct vty *vty, const char *interval_str, | |||
ospf_nbr_timer_update(oi); | |||
} | |||
|
|||
/*Update wait 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.
Better comment here with proper formatting.
8fbcb8d
to
c06c55c
Compare
Signed-off-by: Shbinging <[email protected]>
c06c55c
to
9381d91
Compare
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.
Looks good. Thank you for addressing my comments.
failures in pim ... rerunning to see if we can clear these |
The fix addressed the issue found at #16905.
In the fix, after reconfiguring the dead-interval, the waitTimer, like the helloTimer, will refresh immediately.
In the current OSPF implementation, after configuring the ip ospf dead-interval, the waitTimer does not refresh immediately but waits for the waitTimer to expire before being reconfigured.
In issue 16905, when we configure the waitTimer to a very large value and then clear the OSPF process using clear ip ospf process, the waitTimer is forcibly reset and will wait for this large value until it expires.At this point, configuring a very small value for the dead-interval will not take effect immediately, which results in having to wait a long time. It appears as though the state is stuck.Therefore, if the configured dead-interval is large, we have to use clear ip ospf process each time to refresh the waitTimer.