Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 5 commits into from
Dec 20, 2023
Merged

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

merged 5 commits into from
Dec 20, 2023

Conversation

mssonicbld
Copy link
Collaborator 

* bf62b6ac2 - (head/202305) [submodule] Update submodule linkmgrd to the latest HEAD automatically (#17554) (2023-12-20) [mssonicbld]
* 668a3e0b8 - [submodule] Update submodule sonic-platform-daemons to the latest HEAD automatically (#17555) (2023-12-20) [mssonicbld]
* 9240bcb5b - [Mellanox] Fix race condition while creating SFP (#17544) (2023-12-19) [Junchao-Mellanox]
* 7f03584d9 - Fix syncd_request_shutdown coredump in config reload on KVM sonic (#17486) (#17564) (2023-12-19) [mssonicbld]<br>```

mssonicbld and others added 5 commits December 19, 2023 19:02
@mssonicbld
Fix syncd_request_shutdown coredump in config reload on KVM sonic (#1…
7f03584 
…7486) (#17564)
@Junchao-Mellanox
[Mellanox] Fix race condition while creating SFP (#17544)
9240bcb 
Why I did it
Fix issue xcvrd crashes due to cannot import name 'initialize_sfp_thermal':

Nov 27 09:47:16.388639 sonic ERR pmon#xcvrd: Exception occured at CmisManagerTask thread due to ImportError("cannot import name 'initialize_sfp_thermal' from partially initialized module 'sonic_platform.thermal' (most likely due to a circular import) (/usr/local/lib/python3.9/dist-packages/sonic_platform/thermal.py)")
Nov 27 09:47:16.392544 sonic ERR pmon#xcvrd: Traceback (most recent call last):
Nov 27 09:47:16.392643 sonic ERR pmon#xcvrd:   File "/usr/local/lib/python3.9/dist-packages/xcvrd/xcvrd.py", line 1518, in run
Nov 27 09:47:16.392757 sonic ERR pmon#xcvrd:     self.task_worker()
Nov 27 09:47:16.392757 sonic ERR pmon#xcvrd:   File "/usr/local/lib/python3.9/dist-packages/xcvrd/xcvrd.py", line 1240, in task_worker
Nov 27 09:47:16.392757 sonic ERR pmon#xcvrd:     sfp = platform_chassis.get_sfp(pport)
Nov 27 09:47:16.392793 sonic ERR pmon#xcvrd:   File "/usr/local/lib/python3.9/dist-packages/sonic_platform/chassis.py", line 346, in get_sfp
Nov 27 09:47:16.392830 sonic ERR pmon#xcvrd:     self.initialize_single_sfp(index)
Nov 27 09:47:16.392830 sonic ERR pmon#xcvrd:   File "/usr/local/lib/python3.9/dist-packages/sonic_platform/chassis.py", line 288, in initialize_single_sfp
Nov 27 09:47:16.392830 sonic ERR pmon#xcvrd:     self._sfp_list[index] = sfp_module.SFP(index)
Nov 27 09:47:16.392830 sonic ERR pmon#xcvrd:   File "/usr/local/lib/python3.9/dist-packages/sonic_platform/sfp.py", line 272, in __init__
Nov 27 09:47:16.392866 sonic ERR pmon#xcvrd:     from .thermal import initialize_sfp_thermal
Nov 27 09:47:16.392918 sonic ERR pmon#xcvrd: ImportError: cannot import name 'initialize_sfp_thermal' from partially initialized module 'sonic_platform.thermal' (most likely due to a circular import) (/usr/local/lib/python3.9/dist-packages/sonic_platform/thermal.py)
Nov 27 09:47:16.393103 sonic ERR pmon#xcvrd: Xcvrd: exception found at child thread CmisManagerTask due to ImportError("cannot import name 'initialize_sfp_thermal' from partially initialized module 'sonic_platform.thermal' (most likely due to a circular import) (/usr/local/lib/python3.9/dist-packages/sonic_platform/thermal.py)")
Nov 27 09:47:16.393103 sonic ERR pmon#xcvrd: Exiting main loop as child thread raised exception!
Work item tracking
Microsoft ADO (number only):
How I did it
Add lock for creating SFP object

How to verify it
UNIT TEST
Manual Test
@mssonicbld
[submodule] Update submodule sonic-platform-daemons to the latest HEA…
668a3e0 
…D automatically (#17555)
@mssonicbld
[submodule] Update submodule linkmgrd to the latest HEAD automaticall…
bf62b6a 
…y (#17554)
@mssonicbld
Merge branch '202305' of https://github.com/sonic-net/sonic-buildimage …
6174376 
…into 202305
@mssonicbld mssonicbld requested a review from lguohan as a code owner December 20, 2023 03:02
@mssonicbld mssonicbld merged commit 8d864c7 into Azure:202305 Dec 20, 2023
3 checks passed
jon-nokia pushed a commit to jon-nokia/sonic-buildimage-msft that referenced this pull request May 3, 2024
@mssonicbld
[submodule] Update submodule sonic-gnmi to the latest HEAD automatica…
3939241 
…lly (#18469)

#### Why I did it
src/sonic-gnmi
```
* 98d8e0f - (HEAD -> master, origin/master, origin/HEAD) Add getDpuAddress method to support multiple DPU. (Azure#194) (2 hours ago) [Hua Liu]
```
#### 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
Reviewers

@lguohan lguohan Awaiting requested review from lguohan lguohan is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mssonicbld @Junchao-Mellanox