Skip to content
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

[vxlan decap]: Don't remove tunnel when it has tunnel maps configured #1047

Draft
wants to merge 22 commits into
base: master
Choose a base branch
from

Conversation

pavel-shirshov
Copy link
Contributor

What I did
Fix the issue in orchagent: orchagent allowed removing of a tunnel even if the tunnel has tunnel maps configured.

Why I did it
Because it was an issue.

How I verified it
Add a tunnel and tunnel map, then try to remove tunnel only

Details if related

first = false;
}
SWSS_LOG_WARN("Vxlan tunnel '%s' has tunnel maps configured [%s]. Can't remove now.", tunnel_name.c_str(), vni_list.c_str());
return false;
Copy link
Contributor

Choose a reason for hiding this comment

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

do we do retry here if mapper is not empty?

Copy link
Contributor

Choose a reason for hiding this comment

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

if orchagent gets tunnel remove first and then tunnel map, then we should pend the tunnel remove (retry) later to resolve the dependency issue.

Copy link
Contributor Author

@pavel-shirshov pavel-shirshov Sep 6, 2019

Choose a reason for hiding this comment

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

'return false' mean don't erase from the queue. So the operation will be retried later

We don't have such infrastructure for pending anything in orchagent.
Our common way to deal with this:
If we see that request tries to remove something which has dependencies, just don't do anything and don't erase it from the queue. Later the request is going to be retried, if the dependency still not removed, it will be postponed again. We don't have counters or anything to limit number of attempts to remove something with dependency.

Copy link
Contributor

Choose a reason for hiding this comment

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

i mean retry.

@pavel-shirshov
Copy link
Contributor Author

Currently master branch doesn't have stable sai implementation for this feature. So I'll have it as a draft until we got vxlan support in master.

@lguohan
Copy link
Contributor

lguohan commented Oct 14, 2019

retest this please

EdenGri pushed a commit to EdenGri/sonic-swss that referenced this pull request Feb 28, 2022
* Fix the fast-reboot-dump.py error when it try to use inet_aton to translate ipv6 address
* Add send_ndp as TODO in fast-reboot-dump.py to ipv6 target
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants