Skip to content

[action] [PR:3336] Remove RIF from m_rifsToAdd before deleting it#3499

Merged
mssonicbld merged 1 commit intosonic-net:202411from
mssonicbld:cherry/202411/3336
Feb 7, 2025
Merged

[action] [PR:3336] Remove RIF from m_rifsToAdd before deleting it#3499
mssonicbld merged 1 commit intosonic-net:202411from
mssonicbld:cherry/202411/3336

Conversation

@mssonicbld
Copy link
Collaborator

What I did
I extended the RIF removal functionality to also remove the port from the m_rifsToAdd list.

Why I did it
Typically, the counter and object handling logic follows a strict sequence:

Create an object, then start counter polling.
Stop counter polling, then remove the object.
However, there is deferred logic for RIF counters, where counter polling starts based on a timer rather than immediately.

This process generally works as follows:

  1. Create an object and add it to a list upon receiving an APP_DB update.
  2. Start counter polling for all objects in the list during the timer event.
  3. Stop counter polling for an object.
  4. Remove the object.

If RIF creation and removal occur frequently, removal can happen before the timer event. As a result, the timer may start counter polling for an object that has just been removed, causing the following error message:
ERR syncd#SDK: :- processFlexCounterEvent: port VID oid:0x600000000099d, was not found (probably port was removed/splitted) and will remove from counters now

How I verified it
Tested in regression.

Details if related

<!--
Please make sure you have read and understood the contribution guildlines:
https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md

1. Make sure your commit includes a signature generted with `git commit -s`
2. Make sure your commit title follows the correct format: [component]: description
3. Make sure your commit message contains enough details about the change and related tests
4. Make sure your pull request adds related reviewers, asignees, labels

Please also provide the following information in this pull request:
-->

**What I did**
I extended the RIF removal functionality to also remove the port from the m_rifsToAdd list.

**Why I did it**
Typically, the counter and object handling logic follows a strict sequence:

Create an object, then start counter polling.
Stop counter polling, then remove the object.
However, there is deferred logic for RIF counters, where counter polling starts based on a timer rather than immediately.

This process generally works as follows:

1. Create an object and add it to a list upon receiving an APP_DB update.
2. Start counter polling for all objects in the list during the timer event.
3. Stop counter polling for an object.
4. Remove the object.

If RIF creation and removal occur frequently, removal can happen before the timer event. As a result, the timer may start counter polling for an object that has just been removed, causing the following error message:
```ERR syncd#SDK: :- processFlexCounterEvent: port VID oid:0x600000000099d, was not found (probably port was removed/splitted) and will remove from counters now```

**How I verified it**
Tested in regression.

**Details if related**
@mssonicbld
Copy link
Collaborator Author

Original PR: #3336

@mssonicbld
Copy link
Collaborator Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld mssonicbld merged commit e967711 into sonic-net:202411 Feb 7, 2025
14 checks passed
dgsudharsan pushed a commit that referenced this pull request Feb 25, 2025
```<br>* c939888e - (HEAD -> 202412) Merge branch '202411' of https://github.com/sonic-net/sonic-swss into 202412 (2025-02-08) [Sonic Automation]
* e967711 - (origin/202411) Remove RIF from m_rifsToAdd before deleting it (#3499) (2025-02-07) [mssonicbld]
* 337c9a1 - Optimize counter polling interval by making it more accurate (#3500) (2025-02-07) [mssonicbld]<br>```
dgsudharsan pushed a commit that referenced this pull request Feb 25, 2025
```<br>* 8230dd56 - (HEAD -> 202412) Merge branch '202411' of https://github.com/sonic-net/sonic-swss into 202412 (2025-02-10) [Sonic Automation]
* e967711 - (origin/202411) Remove RIF from m_rifsToAdd before deleting it (#3499) (2025-02-07) [mssonicbld]
* 337c9a1 - Optimize counter polling interval by making it more accurate (#3500) (2025-02-07) [mssonicbld]<br>```
dgsudharsan pushed a commit that referenced this pull request Feb 25, 2025
```<br>* 25634cc1 - (HEAD -> 202412) Merge branch '202411' of https://github.com/sonic-net/sonic-swss into 202412 (2025-02-11) [Sonic Automation]
* fe98176 - (origin/202411) Add a delay between killing teamd processes (#3510) (2025-02-11) [mssonicbld]
* e967711 - Remove RIF from m_rifsToAdd before deleting it (#3499) (2025-02-07) [mssonicbld]
* 337c9a1 - Optimize counter polling interval by making it more accurate (#3500) (2025-02-07) [mssonicbld]<br>```
dgsudharsan pushed a commit that referenced this pull request Feb 25, 2025
```<br>* c93c0eec - (HEAD -> 202412) Merge branch '202411' of https://github.com/sonic-net/sonic-swss into 202412 (2025-02-12) [Sonic Automation]
* 5031aad - (origin/202411) Capability query for MACSEC ACL attribute (#3511) (2025-02-12) [mssonicbld]
* 4b357e5 - Fix VRF update handling for loopback interfaces in IntfsOrch (#3512) (2025-02-12) [mssonicbld]
* fe98176 - Add a delay between killing teamd processes (#3510) (2025-02-11) [mssonicbld]
* e967711 - Remove RIF from m_rifsToAdd before deleting it (#3499) (2025-02-07) [mssonicbld]
* 337c9a1 - Optimize counter polling interval by making it more accurate (#3500) (2025-02-07) [mssonicbld]<br>```
dgsudharsan pushed a commit that referenced this pull request Feb 25, 2025
```<br>* 7532d469 - (HEAD -> 202412) Merge branch '202411' of https://github.com/sonic-net/sonic-swss into 202412 (2025-02-13) [Sonic Automation]
* 5031aad - (origin/202411) Capability query for MACSEC ACL attribute (#3511) (2025-02-12) [mssonicbld]
* 4b357e5 - Fix VRF update handling for loopback interfaces in IntfsOrch (#3512) (2025-02-12) [mssonicbld]
* fe98176 - Add a delay between killing teamd processes (#3510) (2025-02-11) [mssonicbld]
* e967711 - Remove RIF from m_rifsToAdd before deleting it (#3499) (2025-02-07) [mssonicbld]
* 337c9a1 - Optimize counter polling interval by making it more accurate (#3500) (2025-02-07) [mssonicbld]<br>```
dgsudharsan pushed a commit that referenced this pull request Feb 25, 2025
```<br>* 44417f65 - (HEAD -> 202412) Merge branch '202411' of https://github.com/sonic-net/sonic-swss into 202412 (2025-02-14) [Sonic Automation]
* 5031aad - (origin/202411) Capability query for MACSEC ACL attribute (#3511) (2025-02-12) [mssonicbld]
* 4b357e5 - Fix VRF update handling for loopback interfaces in IntfsOrch (#3512) (2025-02-12) [mssonicbld]
* fe98176 - Add a delay between killing teamd processes (#3510) (2025-02-11) [mssonicbld]
* e967711 - Remove RIF from m_rifsToAdd before deleting it (#3499) (2025-02-07) [mssonicbld]
* 337c9a1 - Optimize counter polling interval by making it more accurate (#3500) (2025-02-07) [mssonicbld]<br>```
dgsudharsan pushed a commit that referenced this pull request Feb 25, 2025
```<br>* aaf061fc - (HEAD -> 202412) Merge branch '202411' of https://github.com/sonic-net/sonic-swss into 202412 (2025-02-15) [Sonic Automation]
* 5031aad - (origin/202411) Capability query for MACSEC ACL attribute (#3511) (2025-02-12) [mssonicbld]
* 4b357e5 - Fix VRF update handling for loopback interfaces in IntfsOrch (#3512) (2025-02-12) [mssonicbld]
* fe98176 - Add a delay between killing teamd processes (#3510) (2025-02-11) [mssonicbld]
* e967711 - Remove RIF from m_rifsToAdd before deleting it (#3499) (2025-02-07) [mssonicbld]
* 337c9a1 - Optimize counter polling interval by making it more accurate (#3500) (2025-02-07) [mssonicbld]<br>```
dgsudharsan pushed a commit that referenced this pull request Feb 25, 2025
```<br>* c97d84dd - (HEAD -> 202412) Merge branch '202411' of https://github.com/sonic-net/sonic-swss into 202412 (2025-02-16) [Sonic Automation]
* 5031aad - (origin/202411) Capability query for MACSEC ACL attribute (#3511) (2025-02-12) [mssonicbld]
* 4b357e5 - Fix VRF update handling for loopback interfaces in IntfsOrch (#3512) (2025-02-12) [mssonicbld]
* fe98176 - Add a delay between killing teamd processes (#3510) (2025-02-11) [mssonicbld]
* e967711 - Remove RIF from m_rifsToAdd before deleting it (#3499) (2025-02-07) [mssonicbld]
* 337c9a1 - Optimize counter polling interval by making it more accurate (#3500) (2025-02-07) [mssonicbld]<br>```
dgsudharsan pushed a commit that referenced this pull request Feb 25, 2025
```<br>* f69aaaf1 - (HEAD -> 202412) Merge branch '202411' of https://github.com/sonic-net/sonic-swss into 202412 (2025-02-17) [Sonic Automation]
* 5031aad - (origin/202411) Capability query for MACSEC ACL attribute (#3511) (2025-02-12) [mssonicbld]
* 4b357e5 - Fix VRF update handling for loopback interfaces in IntfsOrch (#3512) (2025-02-12) [mssonicbld]
* fe98176 - Add a delay between killing teamd processes (#3510) (2025-02-11) [mssonicbld]
* e967711 - Remove RIF from m_rifsToAdd before deleting it (#3499) (2025-02-07) [mssonicbld]
* 337c9a1 - Optimize counter polling interval by making it more accurate (#3500) (2025-02-07) [mssonicbld]<br>```
dgsudharsan pushed a commit that referenced this pull request Feb 25, 2025
```<br>* 22d8d147 - (HEAD -> 202412) Merge branch '202411' of https://github.com/sonic-net/sonic-swss into 202412 (2025-02-18) [Sonic Automation]
* 5031aad - (origin/202411) Capability query for MACSEC ACL attribute (#3511) (2025-02-12) [mssonicbld]
* 4b357e5 - Fix VRF update handling for loopback interfaces in IntfsOrch (#3512) (2025-02-12) [mssonicbld]
* fe98176 - Add a delay between killing teamd processes (#3510) (2025-02-11) [mssonicbld]
* e967711 - Remove RIF from m_rifsToAdd before deleting it (#3499) (2025-02-07) [mssonicbld]
* 337c9a1 - Optimize counter polling interval by making it more accurate (#3500) (2025-02-07) [mssonicbld]<br>```
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.

1 participant