fixed unsupported resource issue #1641
Merged
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
Signed-off-by: Prabhu Sreenivasan <[email protected]>
|
/Azurepipelines run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
nazariig
reviewed
Feb 15, 2021
| @@ -439,6 +439,10 @@ void CrmOrch::getResAvailableCounters() | |||
| sai_attribute_t attr; | |||
| attr.id = crmResSaiAvailAttrMap.at(res.first); | |||
|
|
|||
| // ignore unsupported resources | |||
| if (res.second.resStatus != CrmResourceStatus::CRM_RES_SUPPORTED) | |||
| continue; | |||
There was a problem hiding this comment.
@PrabhuSreenivasan please use { } notation and move it at the beginning of the loop
There was a problem hiding this comment.
@nazariig , Thanks. I have made the suggested changes.
Signed-off-by: Prabhu Sreenivasan <[email protected]>
nazariig
approved these changes
Feb 15, 2021
liat-grozovik
approved these changes
Feb 15, 2021
qiluo-msft
approved these changes
Feb 15, 2021
daall
pushed a commit
that referenced
this pull request
Feb 16, 2021
Fix sonic-net/sonic-buildimage#6563 **What I did** Instead of erasing unsupported resource from m_resourcesMap, mark it as unsupported. **Why I did it** Erasing an entry while iterating using range based iterator makes the iterator invalid. Also removing a resource from the m_resourcesMap impacts cross access while iterating other maps (eg crmUsedCntsTableMap). **How I verified it** Added a new unsupported resource for testing and verified the logs.
4 tasks
DavidZagury
pushed a commit
to DavidZagury/sonic-swss
that referenced
this pull request
Mar 4, 2021
Fix sonic-net/sonic-buildimage#6563 **What I did** Instead of erasing unsupported resource from m_resourcesMap, mark it as unsupported. **Why I did it** Erasing an entry while iterating using range based iterator makes the iterator invalid. Also removing a resource from the m_resourcesMap impacts cross access while iterating other maps (eg crmUsedCntsTableMap). **How I verified it** Added a new unsupported resource for testing and verified the logs.
raphaelt-nvidia
pushed a commit
to raphaelt-nvidia/sonic-swss
that referenced
this pull request
Oct 5, 2021
Fix sonic-net/sonic-buildimage#6563 **What I did** Instead of erasing unsupported resource from m_resourcesMap, mark it as unsupported. **Why I did it** Erasing an entry while iterating using range based iterator makes the iterator invalid. Also removing a resource from the m_resourcesMap impacts cross access while iterating other maps (eg crmUsedCntsTableMap). **How I verified it** Added a new unsupported resource for testing and verified the logs.
EdenGri
pushed a commit
to EdenGri/sonic-swss
that referenced
this pull request
Feb 28, 2022
…c-net#1641) * [console][show] Force refresh all lines status during show line * Fix UTs Signed-off-by: Jing Kan [email protected]
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.
Signed-off-by: Prabhu Sreenivasan [email protected]
Fix sonic-net/sonic-buildimage#6563
What I did
Instead of erasing unsupported resource from m_resourcesMap, mark it as unsupported.
Why I did it
Erasing an entry while iterating using range based iterator makes the iterator invalid.
Also removing a resource from the m_resourcesMap impacts cross access while iterating other maps (eg crmUsedCntsTableMap).
How I verified it
Added a new unsupported resource for testing and verified the logs.
Details if related