-
Notifications
You must be signed in to change notification settings - Fork 520
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
pavel-shirshov
wants to merge
22
commits into
sonic-net:master
Choose a base branch
from
pavel-shirshov:pavelsh/vxlan_remove2
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
a5b0a88
Pospone QueueMap initialization until activation of counters
pavel-shirshov 1d54717
Merge branch 'master' of https://github.com/Azure/sonic-swss
pavel-shirshov b767c2e
Merge branch 'master' of https://github.com/Azure/sonic-swss
pavel-shirshov 5e96d67
Generate queue maps only for front panel ports
pavel-shirshov 21c072c
Merge branch 'master' of https://github.com/Azure/sonic-swss
pavel-shirshov 00192a4
Merge branch 'master' of https://github.com/Azure/sonic-swss
pavel-shirshov 1a71c39
Merge branch 'master' of https://github.com/Azure/sonic-swss
pavel-shirshov 6bc8091
Merge branch 'master' of https://github.com/Azure/sonic-swss
pavel-shirshov 83efbee
Merge branch 'master' of https://github.com/Azure/sonic-swss
pavel-shirshov c2f4fdf
Merge branch 'master' of https://github.com/Azure/sonic-swss
pavel-shirshov c4094b0
Merge branch 'master' of https://github.com/Azure/sonic-swss
pavel-shirshov fc6185a
Merge branch 'master' of https://github.com/Azure/sonic-swss
pavel-shirshov 4e5d73d
Merge branch 'master' of https://github.com/Azure/sonic-swss
pavel-shirshov cc57c96
Merge branch 'master' of https://github.com/Azure/sonic-swss
pavel-shirshov 3e879f0
Merge branch 'master' of https://github.com/Azure/sonic-swss
pavel-shirshov 6429642
Merge branch 'master' of https://github.com/Azure/sonic-swss
pavel-shirshov f60c7d1
Merge branch 'master' of https://github.com/Azure/sonic-swss
pavel-shirshov a286fda
Merge branch 'master' of https://github.com/Azure/sonic-swss
pavel-shirshov 3bf6a54
Merge branch 'master' of https://github.com/Azure/sonic-swss
pavel-shirshov 8d446d4
Merge branch 'master' of https://github.com/Azure/sonic-swss
pavel-shirshov c6006a7
Initialize ids with correct values
pavel-shirshov 3c55d0a
Don't remove tunnel when it has tunnel map configured
pavel-shirshov File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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.
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.
do we do retry here if mapper is not empty?
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.
if orchagent gets tunnel remove first and then tunnel map, then we should pend the tunnel remove (retry) later to resolve the dependency issue.
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.
'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.
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 mean retry.