Skip to content

Save is_warm_boot as global value for multi threads #24

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

Merged
vincentchiang-ec merged 1 commit into from
Oct 17, 2025
Merged

Save is_warm_boot as global value for multi threads #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions sonic-xcvrd/tests/test_xcvrd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,7 @@ def test_post_port_sfp_info_to_db(self):

@patch('xcvrd.xcvrd_utilities.port_mapping.PortMapping.logical_port_name_to_physical_port_list', MagicMock(return_value=[0]))
@patch('xcvrd.xcvrd.platform_sfputil', MagicMock(return_value=[0]))
@patch('xcvrd.xcvrd.is_warm_start', MagicMock(return_value=False))
@patch('xcvrd.xcvrd._wrapper_get_presence', MagicMock(return_value=True))
@patch('xcvrd.xcvrd._wrapper_is_replaceable', MagicMock(return_value=True))
@patch('xcvrd.xcvrd.XcvrTableHelper', MagicMock())
Expand Down
9 changes: 5 additions & 4 deletions sonic-xcvrd/xcvrd/xcvrd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@
platform_sfputil = None
# Global chassis object based on new platform api
platform_chassis = None
# Global value to check if warm start
is_warm_start = False

# Global logger instance for helper functions and classes
# TODO: Refactor so that we only need the logger inherited
Expand Down Expand Up @@ -1346,8 +1348,6 @@ def wait_for_port_config_done(self, namespace):
break

def wait_for_warm_reboot_done(self):
is_warm_start = is_warm_reboot_enabled()

if is_warm_start:
self.log_notice("Delay CMISManager until warmboot done")
swsscommon.RestartWaiter.waitWarmBootDone()
Expand Down Expand Up @@ -1965,8 +1965,6 @@ def _post_port_sfp_info_and_dom_thr_to_db_once(self, port_mapping, xcvr_table_he
retry_eeprom_set = set()
port_dict = get_port_speed_and_lane_config()

is_warm_start = is_warm_reboot_enabled()

# Post all the current interface sfp/dom threshold info to STATE_DB
logical_port_list = port_mapping.logical_port_list
for logical_port_name in logical_port_list:
Expand Down Expand Up @@ -2595,6 +2593,7 @@ def wait_for_port_config_done(self, namespace):
def init(self):
global platform_sfputil
global platform_chassis
global is_warm_start

self.log_notice("XCVRD INIT: Start daemon init...")

Expand Down Expand Up @@ -2637,6 +2636,8 @@ def init(self):
media_settings_parser.load_media_settings()
optics_si_parser.load_optics_si_settings()

is_warm_start = is_warm_reboot_enabled()

# Make sure this daemon started after all port configured
self.log_notice("XCVRD INIT: Wait for port config is done")
for namespace in self.namespaces:
Expand Down