ospfd:reset wait timer when reading ip ospf dead-interval #16954
+36
−1
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
Shbinging
force-pushed
the
fix_ip_ospf_deadinterval
branch
2 times, most recently
from
7a02698 to
2a4954f
Compare
2 tasks
aceelindem
requested changes
Oct 1, 2024
Shbinging
force-pushed
the
fix_ip_ospf_deadinterval
branch
from
2a4954f to
9b0310e
Compare
Shbinging
force-pushed
the
fix_ip_ospf_deadinterval
branch
from
9b0310e to
3a0a803
Compare
ton31337
reviewed
Oct 10, 2024
Shbinging
force-pushed
the
fix_ip_ospf_deadinterval
branch
from
3a0a803 to
bb25e3c
Compare
Shbinging
force-pushed
the
fix_ip_ospf_deadinterval
branch
from
bb25e3c to
c9dc6ce
Compare
ok |
Shbinging
force-pushed
the
fix_ip_ospf_deadinterval
branch
from
c9dc6ce to
9479514
Compare
|
@aceelindem is it good now? |
|
I think we're waiting on blocking changes from @aceelindem ? |
aceelindem
requested changes
Nov 5, 2024
| @@ -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.
Better comment here with proper formatting.
Shbinging
force-pushed
the
fix_ip_ospf_deadinterval
branch
3 times, most recently
from
c06c55c to
9381d91
Compare
aceelindem
approved these changes
Nov 6, 2024
|
failures in pim ... rerunning to see if we can clear these |
|
still failing in pim ... might need to be rebased? |
|
@Mergifyio rebase |
Signed-off-by: Shbinging <[email protected]>
✅ Branch has been successfully rebased |
riw777
force-pushed
the
fix_ip_ospf_deadinterval
branch
from
9381d91 to
07bdcc8
Compare
|
looks like we have a new crash that needs to be resolved: |
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.
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.