Skip to content

[code sync] Merge code from sonic-net/sonic-host-services:202605 to 202608 - #19

Merged
mssonicbld merged 2 commits into
Azure:202608from
mssonicbld:sonicbld/202608-merge
Aug 7, 2026
Merged

mssonicbld merged 2 commits into
Azure:202608from
mssonicbld:sonicbld/202608-merge

Conversation

@mssonicbld

Copy link
Copy Markdown
Collaborator
* 46ba6a9 - (origin/202605) Remove pmon.service from gnoi-shutdown.service Wants dependency (#421) (2026-08-06) [mssonicbld]<br>```

mssonicbld and others added 2 commits August 6, 2026 16:14
gnoi-shutdown.service has WantedBy=multi-user.target, so its Wants=pmon.service (added by #343) causes systemd to pull pmon into the boot sequence. This bypasses featured's delayed startup gating for pmon, allowing xcvrd to start before orchagent completes warm restart port reconciliation. When orchagent bounces admin_state to re-apply FEC/serdes settings, the host_tx_ready toggle triggers xcvrd to disable/enable TX lanes on optics ports, causing MAC_REMOTE_FAULT link flaps.

Keep pmon.service in After= to preserve startup ordering without forcing pmon to start. This is consistent with the original wait-for-sonic-core.sh (removed by #343) which treated pmon as advisory.

Fixes: sonic-net/sonic-buildimage#28758

#### Which release branch to backport (provide reason below if selected)
- [x] 202605

#### Tested branch
- [x] 202605

#### Test result
202605: upgrade_path/test_upgrade_path.py passed on DUT with optics ports
Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com>
@mssonicbld
mssonicbld merged commit a2c20ef into Azure:202608 Aug 7, 2026
2 checks passed
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