Skip to content

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

Merged
mssonicbld merged 4 commits intoAzure:202205from
mssonicbld:sonicbld/202205-merge
Mar 26, 2024
Merged

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

Conversation

@mssonicbld
Copy link
Collaborator

* 0f865fa3b - (head/202205) [build] Update debootstrap version from deb11u1 to deb11u2 (#18185) (2024-03-26) [Liu Shilong]
* fcbda4ca4 - dhcrelay: Don't look up the ifindex for the fallback interface (#17797) (#18416) (2024-03-22) [Yaqiang Zhu]
* dcbd39940 - [Nokia][sonic-platform] Update Nokia sonic-platform submodule (#18420) (2024-03-22) [snider-nokia]<br>```

snider-nokia and others added 4 commits March 22, 2024 09:56
- This is primarily to incorporate ungraceful reboot logic to timely bring down front panel ports
  - Fix nokia_cmd show syntax and output, fix hw-management-generate-dump
  - Fix SFM hotplug serial number empty issue
…7) (#18416)

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 <sarcot@microsoft.com>
Co-authored-by: Saikrishna Arcot <sarcot@microsoft.com>
Why I did it
deb11u1 is deprecated.
Use deb11u2 instead.
Other branches are not impacted, because their reproducible build version files are up to date.

Work item tracking
Microsoft ADO (number only): 26964185
How I did it
How to verify it
@mssonicbld mssonicbld requested review from a team, lguohan, qiluo-msft and xumia as code owners March 26, 2024 03:03
@mssonicbld mssonicbld merged commit 4ec6a82 into Azure:202205 Mar 26, 2024
prabhataravind pushed a commit that referenced this pull request Jul 7, 2025
…atically (#22217)

#### Why I did it
src/sonic-snmpagent
```
* 6e0ff93 - (HEAD -> master, origin/master, origin/HEAD) Updating SNMP implementation to handle change of PSU Keys (#312) (33 hours ago) [Gregory Boudreau]
```
#### How I did it
#### How to verify it
#### Description for the changelog
liushilongbuaa pushed a commit that referenced this pull request Mar 25, 2026
…utomatically (#24404)

#### Why I did it
src/sonic-host-services
```
* fda4e65 - (HEAD -> master, origin/master, origin/HEAD) Include info level logs in reboot cause services (#278) (7 days ago) [roy-nexthop]
* 3492186 - Module graceful shutdown support commit 255 is triggering loganalyzer failures in non-smartswitch platforms (#322) (8 days ago) [rameshraghupathy]
* 1d7ec58 - Remove unwrap() in sonic-host-services (#321) (9 days ago) [Qi Luo]
* bbee5e6 - Call sonic-kdump-config --remote after setting ssh_path and ssh_string (#319) (12 days ago) [HP]
* ce60800 - Ignore failures in enabling a systemd service (#320) (12 days ago) [Saikrishna Arcot]
* ee9ef3f - Module graceful shutdown support (#255) (13 days ago) [rameshraghupathy]
* f1de8e3 - Add ExclusionList for telemetry/frr_bmp since they are not service in pub repo (#317) (3 weeks ago) [Feng-msft]
* 6507fa3 - [hostcfg] Fix timezone mismatch after image upgrade (#312) (4 weeks ago) [Ben Levi]
```
#### 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