xcvrd: Address review comments

Make the new DomThermalInfoUpdateTask optional. A program argument is
now necessary for xcvrd which can be set via the `pmon_daemon_control.json`

The new `--dom_temperature_poll_interval` option takes an update
interval in seconds.

Address misc comments

Author: Staphylo

sonic-xcvrd/tests/test_xcvrd.py

@@ -416,6 +416,7 @@ def test_DaemonXcvrd_run_with_exception(self, mock_task_join_sff, mock_task_join
         mock_init.return_value = PortMapping()
         xcvrd = DaemonXcvrd(SYSLOG_IDENTIFIER)
         xcvrd.enable_sff_mgr = True
+        xcvrd.dom_temperature_poll_interval = 10
         xcvrd.load_feature_flags = MagicMock()
         xcvrd.stop_event.wait = MagicMock()
         xcvrd.run()

sonic-xcvrd/xcvrd/dom/dom_mgr.py

@@ -119,7 +119,7 @@ def run(self):
         try:
             self.task_worker()
         except Exception as e:
-            self.log_error("Exception occured at {} thread due to {}".format(threading.current_thread().getName(), repr(e)))
+            self.log_error("Exception occurred at {} thread due to {}".format(threading.current_thread().getName(), repr(e)))
             xcvrd.log_exception_traceback()
             self.exc = e
             self.main_thread_stop_event.set()
@@ -488,22 +488,20 @@ def on_remove_logical_port(self, port_change_event):
                                       self.xcvr_table_helper.get_firmware_info_tbl(port_change_event.asic_id)
                                       ])
 
-
 class DomThermalInfoUpdateTask(DomInfoUpdateBase):
     name = 'DomThermalInfoUpdateTask'
 
-    DOM_INFO_UPDATE_PERIOD_SECS = 5
-
-    def __init__(self, namespaces, port_mapping, sfp_obj_dict, main_thread_stop_event):
+    def __init__(self, namespaces, port_mapping, sfp_obj_dict, main_thread_stop_event, poll_interval):
         super().__init__(namespaces, port_mapping, sfp_obj_dict, main_thread_stop_event)
+        self.poll_interval = poll_interval
         self.xcvr_table_helper = XcvrTableHelper(self.namespaces)
         self.dom_db_utils = DOMDBUtils(self.sfp_obj_dict, self.port_mapping, self.xcvr_table_helper, self.task_stopping_event, self.helper_logger)
 
     def task_worker(self):
         self.log_notice("Start DOM thermal monitoring loop")
 
         # Set the periodic db update time
-        dom_info_update_periodic_secs = self.DOM_INFO_UPDATE_PERIOD_SECS
+        dom_info_update_periodic_secs = self.poll_interval
 
         # Poll transceiver temperature as soon as possible
         next_periodic_db_update_time = datetime.datetime.now()
@@ -514,7 +512,7 @@ def task_worker(self):
             now = datetime.datetime.now()
             if next_periodic_db_update_time > now:
                # Sleep for 1 second or less depending on the remaining time
-               time.sleep(min(1, (next_periodic_db_update_time - now).total_seconds()))
+               time.sleep(max(0, min(1, (next_periodic_db_update_time - now).total_seconds())))
                continue
 
             for physical_port, logical_ports in self.port_mapping.physical_to_logical.items():
@@ -532,7 +530,7 @@ def task_worker(self):
                     continue
 
                 if not sfp_status_helper.detect_port_in_error_status(logical_port_name, self.xcvr_table_helper.get_status_sw_tbl(asic_index)):
-                    if not xcvrd._wrapper_get_presence(physical_port):
+                    if not common._wrapper_get_presence(physical_port):
                         continue
 
                 try:

sonic-xcvrd/xcvrd/xcvrd.py

@@ -1987,12 +1987,13 @@ def update_log_level(self):
 
 
 class DaemonXcvrd(daemon_base.DaemonBase):
-    def __init__(self, log_identifier, skip_cmis_mgr=False, enable_sff_mgr=False):
+    def __init__(self, log_identifier, skip_cmis_mgr=False, enable_sff_mgr=False, dom_temperature_poll_interval=None):
         super(DaemonXcvrd, self).__init__(log_identifier, enable_runtime_log_config=True)
         self.stop_event = threading.Event()
         self.sfp_error_event = threading.Event()
         self.skip_cmis_mgr = skip_cmis_mgr
         self.enable_sff_mgr = enable_sff_mgr
+        self.dom_temperature_poll_interval = dom_temperature_poll_interval
         self.namespaces = ['']
         self.threads = []
         self.sfp_obj_dict = {}
@@ -2269,9 +2270,12 @@ def run(self):
         self.threads.append(dom_info_update)
 
         # Start the dom thermal sensor info update thread
-        dom_thermal_info_update = DomThermalInfoUpdateTask(self.namespaces, port_mapping_data, self.sfp_obj_dict, self.stop_event)
-        dom_thermal_info_update.start()
-        self.threads.append(dom_thermal_info_update)
+        dom_thermal_info_update = None
+        if self.dom_temperature_poll_interval is not None:
+            dom_thermal_info_update = DomThermalInfoUpdateTask(self.namespaces, port_mapping_data, self.sfp_obj_dict, self.stop_event,
+                                                               self.dom_temperature_poll_interval)
+            dom_thermal_info_update.start()
+            self.threads.append(dom_thermal_info_update)
 
         # Start the sfp state info update thread
         sfp_state_update = SfpStateUpdateTask(self.namespaces, port_mapping_data, self.sfp_obj_dict, self.stop_event, self.sfp_error_event)
@@ -2316,8 +2320,9 @@ def run(self):
             dom_info_update.join()
 
         # Stop the dom thermal sensor info update thread
-        if dom_thermal_info_update.is_alive():
-            dom_thermal_info_update.join()
+        if dom_thermal_info_update is not None:
+            if dom_thermal_info_update.is_alive():
+                dom_thermal_info_update.join()
 
         # Stop the sfp state info update thread
         if sfp_state_update.is_alive():
@@ -2344,9 +2349,11 @@ def main():
     parser = argparse.ArgumentParser()
     parser.add_argument('--skip_cmis_mgr', action='store_true')
     parser.add_argument('--enable_sff_mgr', action='store_true')
+    parser.add_argument('--dom_temperature_poll_interval', default=None, type=int)
 
     args = parser.parse_args()
-    xcvrd = DaemonXcvrd(SYSLOG_IDENTIFIER, args.skip_cmis_mgr, args.enable_sff_mgr)
+    xcvrd = DaemonXcvrd(SYSLOG_IDENTIFIER, args.skip_cmis_mgr, args.enable_sff_mgr,
+                        args.dom_temperature_poll_interval)
     xcvrd.run()