Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305#229

Merged
mssonicbld merged 8 commits intoAzure:202305from
mssonicbld:sonicbld/202305-merge
Jan 20, 2024
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305#229
mssonicbld merged 8 commits intoAzure:202305from
mssonicbld:sonicbld/202305-merge

Conversation

@mssonicbld
Copy link
Collaborator

* 208c1705f - (head/202305) [submodule] Update submodule sonic-snmpagent to the latest HEAD automatically (#17859) (2024-01-20) [mssonicbld]
* 306175be2 - dhcrelay: Don't look up the ifindex for the fallback interface (#17797) (#17840) (2024-01-19) [Saikrishna Arcot]
* fc7a1ac02 - [submodule] Update submodule sonic-snmpagent to the latest HEAD automatically (#17853) (2024-01-19) [mssonicbld]
* 30b1f05f0 - [submodule] Update submodule linkmgrd to the latest HEAD automatically (#17851) (2024-01-19) [mssonicbld]
* 66ce73934 - [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#17855) (2024-01-19) [mssonicbld]
* 076b6c3d2 - upgrade xgs SAI to 8.4.39.2 (#17842) (2024-01-19) [zitingguo-ms]
* 6d767e549 - [chassis] Support advertisement of Loopback0 of all LC's across all e-BGP peers in TSA mode (#16714) (#17837) (2024-01-19) [abdosi]<br>```

abdosi and others added 8 commits January 19, 2024 12:53
…-BGP peers in TSA mode (#16714) (#17837)

What I did:
In Chassis TSA mode Loopback0 Ip's of each LC's should be advertise through e-BGP peers of each remote LC's

How I did:

- Route-map policy to Advertise own/self Loopback IP to other internal iBGP peers with a community internal_community as define in constants.yml
- Route-map policy to match on above internal_community when route is received from internal iBGP peers and set a internal tag as define in constants.yml and also delete the internal_community so we don't send to any of e-BGP peers
- In TSA new route-map match on above internal tag and permit the route (Loopback0 IP's of remote LC's) and set the community to traffic_shift_community.
- In TSB delete the above new route-map.

How I verify:

Manual Verification

UT updated.
sonic-mgmt PR: sonic-net/sonic-mgmt#10239

Signed-off-by: Abhishek Dosi <[email protected]>
Why I did it
Upgrade the xgs SAI version to 8.4.39.2 to include the following fix:

8.4.36.0: [submodule upgrade] [SAI_BRANCH rel_ocp_sai_8_4] SID: SDK-381039 Cosq control dynamic type changes
8.4.37.0: SID: MMU cosq control configuration with Dynamic Type Check
8.4.38.0: [sbumodule upgrade] [CSP 0001232212][SAI_BRANCH rel_ocp_sai_8_4]back-porting SONIC-82415 to SAI 8.4
8.4.39.0: [CSP CS00012320979] Port SONIC-81867 sai spec compliance for get SAI_SWITCH_ATTR_SWITCH_HARDWARE_INFO
8.4.39.1: changes for phy-re-init of 40G ports for TH platforms CS00012327470
8.4.39.2: fix capability for Hostif queue by change SET operation of SAI_HOSTIF_ATTR_QUEUE to be true
Work item tracking
Microsoft ADO (number only): 26491005
How I did it
Upgrade xgs SAI version in sai.mk file.

How to verify it
Run basic SONiC test using SAI release pipeline, all cases passed.
https://dev.azure.com/mssonic/internal/_build/results?buildId=457869&view=results
…atically (#17855)

#### Why I did it
src/sonic-utilities
```
* 93c42272 - (HEAD -> 202305, origin/202305) [chassis]: Support show ip bgp summary to display without error when no external neighbors are configured on chassis LC (#3099) (22 hours ago) [Arvindsrinivasan Lakshmi Narasimhan]
```
#### How I did it
#### How to verify it
#### Description for the changelog
…y (#17851)

#### Why I did it
src/linkmgrd
```
* f5e9b54 - (HEAD -> 202305, origin/202305) [CodeQL] fix unmet build dependency (Azure#222) (10 hours ago) [Jing Zhang]
* 2282cc5 - [active-standby] Probe the link in suspend timeout (Azure#235) (22 hours ago) [Longxiang Lyu]
```
#### How I did it
#### How to verify it
#### Description for the changelog
…atically (#17853)

#### Why I did it
src/sonic-snmpagent
```
* b0a4bcc - (HEAD -> 202305, origin/202305) Set the execute bit on sysDescr_pass.py (Azure#306) (22 hours ago) [Andre Kostur]
```
#### How I did it
#### How to verify it
#### Description for the changelog
…7) (#17840)

Currently, whenever isc-dhcp-relay forwards a packet upstream,
internally, it will try to send it on a "fallback" interface. My
understanding is that this isn't meant to be a real interface, but
instead is basically saying to use Linux's regular routing stack to
route the packet appropriately (rather than having isc-dhcp-relay
specify specifically which interface to use).

The problem is that on systems with a weak CPU, a large number of
interfaces, and many upstream servers specified, this can introduce a
noticeable delay in packets getting sent. The delay comes from trying to
get the ifindex of the fallback interface. In one test case, it got to
the point that only 2 packets could be processed per second. Because of
this, dhcrelay will easily get backlogged and likely get to a point
where packets get dropped in the kernel.

Fix this by adding a check saying if we're using the fallback interface,
then don't try to get the ifindex of this interface. We're never going
to have an interface named this in SONiC.

Signed-off-by: Saikrishna Arcot <[email protected]>
…atically (#17859)

#### Why I did it
src/sonic-snmpagent
```
* 2efaf2e - (HEAD -> 202305, origin/202305) Revert "[action] [PR:303] Fix SNMP dropping some of the queue counter when create_only_config_db_buffers is set to true (Azure#303)" (Azure#308) (4 minutes ago) [StormLiangMS]
```
#### How I did it
#### How to verify it
#### Description for the changelog
@mssonicbld mssonicbld merged commit e3572c6 into Azure:202305 Jan 20, 2024
r12f pushed a commit that referenced this pull request Dec 19, 2024
…lly (#18888)

#### Why I did it
src/sonic-gnmi
```
* c2bfe3d - (HEAD -> master, origin/master, origin/HEAD) Fix memory leak in unit test (#230) (44 minutes ago) [ganglv]
* 16c2975 - Disable translib unit test (#229) (71 minutes ago) [ganglv]
* 4c86853 - Merge pull request #224 from ganglyu/fix_build (10 hours ago) [Saikrishna Arcot]
* db2d896 - Disable dialout unit test (3 days ago) [ganglyu]
* 0e4ac4d - Disable translib test (4 days ago) [ganglyu]
* 8494e90 - Fix unit test (4 days ago) [ganglyu]
* 036979d - Fix unit test (4 days ago) [ganglyu]
* bd74b09 - Disable failed unit test (4 days ago) [ganglyu]
* a4bc960 - Update go.mod (7 days ago) [ganglyu]
* c15d45f - Fix build error (7 days ago) [ganglyu]
* 775a41e - Fix go.sum (7 days ago) [ganglyu]
* b39742e - Fix build error from sonic-mgmt-common (7 days ago) [ganglyu]
```
#### How I did it
#### How to verify it
#### Description for the changelog
prabhataravind pushed a commit that referenced this pull request Jul 7, 2025
…utomatically (#22041)

#### Why I did it
src/sonic-host-services
```
* 085db0f - (HEAD -> master, origin/master, origin/HEAD) Periodically check the status of the pmon container during HALT and return early if it has stopped (#229) (3 days ago) [Vasundhara Volam]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Aug 15, 2025
…AD automatically (#1516)

#### Why I did it
src/sonic-utilities
```
* 0dab1b7a - (HEAD -> 202503, origin/202503) Merge pull request #229 from mssonicbld/sonicbld/202503-merge (23 hours ago) [mssonicbld]
* 372f958c - Merge branch '202412' of https://github.com/Azure/sonic-utilities.msft into 202503 (23 hours ago) [Sonic Automation]
* 87420914 - (origin/202412) Pr json support for show platform temperature (#228) (34 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
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.

4 participants