Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205#156

Merged
mssonicbld merged 2 commits intoAzure:202205from
mssonicbld:sonicbld/202205-merge
Nov 16, 2023
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205#156
mssonicbld merged 2 commits intoAzure:202205from
mssonicbld:sonicbld/202205-merge

Conversation

@mssonicbld
Copy link
Copy Markdown
Collaborator

* 2765e8020 - (head/202205) [tph]: Detect LAG flaps from APPL_DB (#16879) (#17156) (2023-11-15) [Lawrence Lee]<br>```

theasianpianist and others added 2 commits November 15, 2023 11:02
Why I did it
A race condition exists while the TPH is processing a netlink message - if a second netlink message arrives during processing it will be missed since TPH is not listening for other messages.
Another bug was found where TPH was unnecessarily restarting since it was checking admin status instead of operational status of portchannels.

How I did it
Subscribe to APPL_DB for updates on LAG operational state
Track currently sniffed interfaces

How to verify it
Send tunnel packets with destination IP of an unresolved neighbor, verify that ping commands are run
Shut down a portchannel interface, verify that sniffer does not restart
Send tunnel packets, verify ping commands are still run
Bring up portchannel interface, verify that sniffer restarts

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
@mssonicbld mssonicbld requested a review from lguohan as a code owner November 16, 2023 03:01
@mssonicbld mssonicbld merged commit 5aa761d into Azure:202205 Nov 16, 2023
mssonicbld added a commit that referenced this pull request Mar 18, 2025
…atically (#916)

#### Why I did it
src/sonic-utilities
```
* 36ba067f - (HEAD -> 202412, origin/202412) Merge pull request #156 from mssonicbld/sonicbld/202412-merge (11 hours ago) [mssonicbld]
* dcf62147 - Merge branch '202411' of https://github.com/sonic-net/sonic-utilities into 202412 (16 hours ago) [Sonic Automation]
* b197a610 - [db_migrator] Migrate tunnel table (#3806) (4 days ago) [mssonicbld]
* 5b765f3f - [GCU] Add data acl table and rule check (#3807) (4 days ago) [mssonicbld]
* 04bc01d9 - [Techsupport]Add show route-map command to frr dumps in techsupport (#3803) (5 days ago) [mssonicbld]
* 7a3f4ad6 - Fix the interface name length validation for subinterface (#3799) (7 days ago) [mssonicbld]
* 357f95d3 - enable pfcwd for backplane ports (#3796) (11 days ago) [mssonicbld]
* 7f316e7c - revert YANG check in db_migrator (#3794) (12 days ago) [mssonicbld]
* c01a4f5f - Add namespace support for show interface neighbor expected (#3790) (2 weeks ago) [mssonicbld]
* 17a7b18b - Fix `vnet_route_check` for active and inactive routes, add `--all` option (#3780) (3 weeks ago) [mssonicbld]
* 5cc10123 - [202411][FC] remove FC delay field (#3768) (3 weeks ago) [Stepan Blyshchak]
* 8ceba38b - [QOS] Skip showing unnecessary warning message (#3762) (5 weeks ago) [mssonicbld]
* 04b60e22 - Fix call for spanning-tree commands in dump script (#3752) (6 weeks ago) [mssonicbld]
* bbe29aee - [show][interface] Add changes for show interface errors command (#3749) (6 weeks ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
arlakshm pushed a commit that referenced this pull request Sep 18, 2025
…tomatically (#1632)

#### Why I did it
src/sonic-swss
```
* 1ce1e23f - (HEAD -> 202405, origin/202405) [202405] Fix Orchagent crashes from port down cnt out of range conversion. (#156) (2 hours ago) [jfeng-arista]
```
#### How I did it
#### How to verify it
#### Description for the changelog
r12f pushed a commit that referenced this pull request Jan 23, 2026
…tomatically (#1943)

#### Why I did it
src/sonic-gnmi
```
* db5685b - (HEAD -> 202412, origin/202412) Fix codeQL analysis issue (#152) (28 minutes ago) [Feng-msft]
* 29c0f3d - [ci] Use the correct slave container for the branch (#156) (2 hours ago) [yijingyan2]
```
#### How I did it
#### How to verify it
#### Description for the changelog

Signed-off-by: Sonic Automation <sonicbld@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants