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

[Mellanox] set select timeout to no more than 1 sec to make sure fast shutdown #13611

Merged
merged 1 commit into from
Feb 14, 2023
Merged

[Mellanox] set select timeout to no more than 1 sec to make sure fast shutdown #13611

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
24 changes: 14 additions & 10 deletions platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
from . import utils
from .device_data import DeviceDataManager
import re
import time
except ImportError as e:
raise ImportError (str(e) + "- required module not found")

MAX_SELECT_DELAY = 3600

RJ45_TYPE = "RJ45"

Expand Down Expand Up @@ -387,26 +387,30 @@ def get_change_event(self, timeout=0):
self.sfp_event.initialize()

wait_for_ever = (timeout == 0)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure if you still want to keep this timeout=0 for future use

# select timeout should be no more than 1000ms to ensure fast shutdown flow
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Junchao-Mellanox may be add more context in the comment why max timeout is kept 1sec?

select_timeout = 1000.0 if timeout >= 1000 else float(timeout)
port_dict = {}
error_dict = {}
if wait_for_ever:
timeout = MAX_SELECT_DELAY
while True:
status = self.sfp_event.check_sfp_status(port_dict, error_dict, timeout)
if bool(port_dict):
begin = time.time()
while True:
status = self.sfp_event.check_sfp_status(port_dict, error_dict, select_timeout)
if bool(port_dict):
break

if not wait_for_ever:
elapse = time.time() - begin
if elapse * 1000 > timeout:
break
else:
status = self.sfp_event.check_sfp_status(port_dict, error_dict, timeout)

if status:
if port_dict:
self.reinit_sfps(port_dict)
result_dict = {'sfp':port_dict}
result_dict = {'sfp': port_dict}
if error_dict:
result_dict['sfp_error'] = error_dict
return True, result_dict
else:
return True, {'sfp':{}}
return True, {'sfp': {}}

def reinit_sfps(self, port_dict):
"""
Expand Down