Skip to content

Commit

Permalink
[xcvrd] Fix missing sfp info table entry issue (sonic-net#30)
Browse files Browse the repository at this point in the history
  • Loading branch information
@keboliu @jleveque
keboliu authored and jleveque committed Jul 1, 2019
1 parent 84bca64 commit 6618737
Showing 1 changed file with 37 additions and 22 deletions.
59 changes: 37 additions & 22 deletions sonic-xcvrd/scripts/xcvrd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ SELECT_TIMEOUT_MSECS = 1000

DOM_INFO_UPDATE_PERIOD_SECS = 60
TIME_FOR_SFP_READY_SECS = 1
XCVRD_MAIN_THREAD_SLEEP_SECS = 60

SFP_STATUS_INSERTED = '1'
SFP_STATUS_REMOVED = '0'
Expand Down Expand Up @@ -114,7 +115,7 @@ def beautify_dom_info_dict(dom_info_dict):

# Update port sfp info in db
def post_port_sfp_info_to_db(logical_port_name, table, transceiver_dict,
stop=threading.Event()):
stop_event=threading.Event()):
ganged_port = False
ganged_member_num = 1

Expand All @@ -127,7 +128,7 @@ def post_port_sfp_info_to_db(logical_port_name, table, transceiver_dict,
ganged_port = True

for physical_port in physical_port_list:
if stop.is_set():
if stop_event.is_set():
break

if not platform_sfputil.get_presence(physical_port):
Expand Down Expand Up @@ -164,7 +165,7 @@ def post_port_sfp_info_to_db(logical_port_name, table, transceiver_dict,
sys.exit(NOT_IMPLEMENTED_ERROR)

# Update port dom sensor info in db
def post_port_dom_info_to_db(logical_port_name, table, stop=threading.Event()):
def post_port_dom_info_to_db(logical_port_name, table, stop_event=threading.Event()):
ganged_port = False
ganged_member_num = 1

Expand All @@ -177,7 +178,7 @@ def post_port_dom_info_to_db(logical_port_name, table, stop=threading.Event()):
ganged_port = True

for physical_port in physical_port_list:
if stop.is_set():
if stop_event.is_set():
break

if not platform_sfputil.get_presence(physical_port):
Expand Down Expand Up @@ -213,7 +214,7 @@ def post_port_dom_info_to_db(logical_port_name, table, stop=threading.Event()):
sys.exit(NOT_IMPLEMENTED_ERROR)

# Update port dom/sfp info in db
def post_port_sfp_dom_info_to_db(is_warm_start, stop=threading.Event()):
def post_port_sfp_dom_info_to_db(is_warm_start, stop_event=threading.Event()):
# Connect to STATE_DB and create transceiver dom/sfp info tables
transceiver_dict = {}
state_db = daemon_base.db_connect(swsscommon.STATE_DB)
Expand All @@ -227,11 +228,11 @@ def post_port_sfp_dom_info_to_db(is_warm_start, stop=threading.Event()):
# Post all the current interface dom/sfp info to STATE_DB
logical_port_list = platform_sfputil.logical
for logical_port_name in logical_port_list:
if stop.is_set():
if stop_event.is_set():
break

post_port_sfp_info_to_db(logical_port_name, int_tbl, transceiver_dict, stop)
post_port_dom_info_to_db(logical_port_name, dom_tbl, stop)
post_port_sfp_info_to_db(logical_port_name, int_tbl, transceiver_dict, stop_event)
post_port_dom_info_to_db(logical_port_name, dom_tbl, stop_event)
## Do not notify media settings during warm reboot to avoid dataplane traffic impact
if is_warm_start == False:
notify_media_setting(logical_port_name, transceiver_dict, app_port_tbl)
Expand Down Expand Up @@ -262,6 +263,19 @@ def del_port_sfp_dom_info_from_db(logical_port_name, int_tbl, dom_tbl):
logger.log_error("This functionality is currently not implemented for this platform")
sys.exit(NOT_IMPLEMENTED_ERROR)

# recover missing sfp table entries if any
def recover_missing_sfp_table_entries(sfp_util, int_tbl, stop_event):
transceiver_dict = {}

keys = int_tbl.getKeys()
logical_port_list = sfp_util.logical
for logical_port_name in logical_port_list:
if stop_event.is_set():
break
if logical_port_name not in keys:
post_port_sfp_info_to_db(logical_port_name, int_tbl, transceiver_dict, stop_event)


def check_port_in_range(range_str, physical_port):
range_separator = '-'
range_list = range_str.split(range_separator)
Expand Down Expand Up @@ -573,19 +587,19 @@ class DaemonXcvrd(DaemonBase):
def __init__(self):
DaemonBase.__init__(self)

self.timeout = 1
self.stop = threading.Event()
self.timeout = XCVRD_MAIN_THREAD_SLEEP_SECS
self.stop_event = threading.Event()

# Signal handler
def signal_handler(self, sig, frame):
if sig == signal.SIGHUP:
logger.log_info("Caught SIGHUP - ignoring...")
elif sig == signal.SIGINT:
logger.log_info("Caught SIGINT - exiting...")
self.stop.set()
self.stop_event.set()
elif sig == signal.SIGTERM:
logger.log_info("Caught SIGTERM - exiting...")
self.stop.set()
self.stop_event.set()
else:
logger.log_warning("Caught unhandled signal '" + sig + "'")

Expand All @@ -599,7 +613,7 @@ class DaemonXcvrd(DaemonBase):
sel.addSelectable(sst)

# Make sure this daemon started after all port configured
while not self.stop.is_set():
while not self.stop_event.is_set():
(state, c) = sel.select(SELECT_TIMEOUT_MSECS)
if state == swsscommon.Select.TIMEOUT:
continue
Expand Down Expand Up @@ -646,6 +660,11 @@ class DaemonXcvrd(DaemonBase):
logger.log_error("Failed to read port info: %s" % (str(e)), True)
sys.exit(PORT_CONFIG_LOAD_ERROR)

# Connect to STATE_DB and create transceiver dom/sfp info tables
state_db = daemon_base.db_connect(swsscommon.STATE_DB)
self.int_tbl = swsscommon.Table(state_db, TRANSCEIVER_INFO_TABLE)
self.dom_tbl = swsscommon.Table(state_db, TRANSCEIVER_DOM_SENSOR_TABLE)

self.load_media_settings()
warmstart = swsscommon.WarmStart()
warmstart.initialize("xcvrd", "pmon")
Expand All @@ -658,21 +677,16 @@ class DaemonXcvrd(DaemonBase):

# Post all the current interface dom/sfp info to STATE_DB
logger.log_info("Post all port DOM/SFP info to DB")
post_port_sfp_dom_info_to_db(is_warm_start, self.stop)
post_port_sfp_dom_info_to_db(is_warm_start, self.stop_event)

# Deinitialize daemon
def deinit(self):
logger.log_info("Start daemon deinit...")

# Connect to STATE_DB and create transceiver dom/sfp info tables
state_db = daemon_base.db_connect(swsscommon.STATE_DB)
int_tbl = swsscommon.Table(state_db, TRANSCEIVER_INFO_TABLE)
dom_tbl = swsscommon.Table(state_db, TRANSCEIVER_DOM_SENSOR_TABLE)

# Delete all the information from DB and then exit
logical_port_list = platform_sfputil.logical
for logical_port_name in logical_port_list:
del_port_sfp_dom_info_from_db(logical_port_name, int_tbl, dom_tbl)
del_port_sfp_dom_info_from_db(logical_port_name, self.int_tbl, self.dom_tbl)

# Run daemon
def run(self):
Expand All @@ -692,8 +706,9 @@ class DaemonXcvrd(DaemonBase):
# Start main loop
logger.log_info("Start daemon main loop")

while not self.stop.wait(self.timeout):
pass
while not self.stop_event.wait(self.timeout):
# Check the integrity of the sfp info table and recover the missing entries if any
recover_missing_sfp_table_entries(platform_sfputil, self.int_tbl, self.stop_event)

logger.log_info("Stop daemon main loop")

Expand Down

0 comments on commit 6618737

Please sign in to comment.