Skip to content

[neighsyncd] increase neighbor syncd restore timeout to 110 seconds #745

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.

Sign up for GitHub

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

Merged
yxieca merged 3 commits into from
Feb 7, 2019
Merged

[neighsyncd] increase neighbor syncd restore timeout to 110 seconds #745

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e59b40c
[neighsyncd] increase neighbor syncd restore timeout to 120 seconds
yxieca Jan 10, 2019
904f652
[restore_neighbor] improve restore neighbor timeouts
yxieca Feb 5, 2019
c0df948
Set default values according group discussion result
yxieca Feb 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions neighsyncd/neighsync.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@

/*
* This is the timer value (in seconds) that the neighsyncd waits for restore_neighbors
* service to finish, should be longer than the restore_neighbors timeout value (60)
* service to finish, should be longer than the restore_neighbors timeout value (120)
* This should not happen, if happens, system is in a unknown state, we should exit.
*/
#define RESTORE_NEIGH_WAIT_TIME_OUT 70
#define RESTORE_NEIGH_WAIT_TIME_OUT 130

namespace swss {

Expand Down
5 changes: 3 additions & 2 deletions neighsyncd/restore_neighbors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@
# timeout the restore process in 1 min if not finished
# This is mostly to wait for interfaces to be created and up after system warm-reboot
# and this process is started by supervisord in swss docker.
# It would be good to keep that time below routing reconciliation time-out.
TIME_OUT = 60
# It would be good to keep that time consistent routing reconciliation time-out, here
# we are upstream, we shouldn't give up before down stream.
TIME_OUT = 120
Copy link
Copy Markdown
Collaborator

@zhenggen-xu zhenggen-xu Jan 12, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@yxieca In normal case, if the interface wasn't down or unconfigured during the warm reboot, the neighbor should be restored right after the interfaces are ready ( a few seconds later), and it should usually be faster than the routing reconciliation since protocol takes time to converge.

The timer here is just to make sure we don't stuck if interfaces state was changed (down) during the warm reboot. So we could wait as much as routing stack timer configured.

I think this timer should be slightly smaller than the routing timer, so when the routing reconciliation is done, it already has the reconciled neighbors in place at SONiC orchagent. Set this value same or higher than routing timer means the neighbor could be reconciled after routing is reconciled, it should work just not optimal in the processing pipe of orchagent.

Since you are changing the value here, do you think you can read the routing timer or if not configured use the default one, then set this accordingly here?

Copy link
Copy Markdown
Contributor Author

@yxieca yxieca Feb 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resolved other conversations. Leaving this one for final confirmation.

@zhenggen-xu I made change according to our last conversation. Please take a look again.

Thanks,
Ying


# every 5 seconds to check interfaces states
CHECK_INTERVAL = 5
Expand Down