Fix xcvrd busy issue

Author: Jostar Yang

device/accton/x86_64-accton_as4630_54pe-r0/sonic_platform/chassis.py

@@ -27,7 +27,7 @@
 PMON_REBOOT_CAUSE_PATH = "/usr/share/sonic/platform/api_files/reboot-cause/"
 REBOOT_CAUSE_FILE = "reboot-cause.txt"
 PREV_REBOOT_CAUSE_FILE = "previous-reboot-cause.txt"
-HOST_CHK_CMD = "docker > /dev/null 2>&1"
+HOST_CHK_CMD = "which systemctl > /dev/null 2>&1"
 SYSLED_FNODE = "/sys/class/leds/diag/brightness"
 SYSLED_MODES = {
     "0" : "STATUS_LED_COLOR_OFF",
@@ -43,25 +43,25 @@ class Chassis(ChassisBase):
     def __init__(self):
         ChassisBase.__init__(self)
         self._api_helper = APIHelper()
-        self._api_helper = APIHelper()
         self.is_host = self._api_helper.is_host()
-        
+
         self.config_data = {}
-        
+
         self.__initialize_fan()
         self.__initialize_psu()
         self.__initialize_thermals()
         self.__initialize_components()
         self.__initialize_sfp()
         self.__initialize_eeprom()
-    
+
     def __initialize_sfp(self):
         from sonic_platform.sfp import Sfp
         for index in range(0, PORT_END):
             sfp = Sfp(index)
             self._sfp_list.append(sfp)
+        self._sfpevent = SfpEvent(self._sfp_list)
         self.sfp_module_initialized = True
-        
+
     def __initialize_fan(self):
        from sonic_platform.fan_drawer import FanDrawer
        for fant_index in range(NUM_FAN_TRAY):
@@ -94,7 +94,7 @@ def __initialize_components(self):
     def __initialize_watchdog(self):
         from sonic_platform.watchdog import Watchdog
         self._watchdog = Watchdog()
-    
+
 
     def __is_host(self):
         return os.system(HOST_CHK_CMD) == 0
@@ -123,15 +123,15 @@ def get_presence(self):
             bool: True if Chassis is present, False if not
         """
         return True
-    
+
     def get_status(self):
         """
         Retrieves the operational status of the device
         Returns:
             A boolean value, True if device is operating properly, False if not
         """
         return True
-    
+
     def get_base_mac(self):
         """
         Retrieves the base MAC address for the chassis
@@ -148,7 +148,7 @@ def get_model(self):
             string: Model/part number of device
         """
         return self._eeprom.get_pn()
-        
+
     def get_serial(self):
         """
         Retrieves the hardware serial number for the chassis
@@ -190,10 +190,7 @@ def get_change_event(self, timeout=0):
         # SFP event
         if not self.sfp_module_initialized:
             self.__initialize_sfp()
-
-        status, sfp_event = SfpEvent(self._sfp_list).get_sfp_event(timeout)
-        
-        return status, sfp_event
+        return self._sfpevent.get_sfp_event(timeout)
 
     def get_sfp(self, index):
         """
@@ -235,7 +232,7 @@ def is_replaceable(self):
         """
         return False
 
-        
+
     def initizalize_system_led(self):
         return True
 
@@ -253,4 +250,4 @@ def set_status_led(self, color):
             return False
         else:
             return self._api_helper.write_txt_file(SYSLED_FNODE, mode)
-            
+

device/accton/x86_64-accton_as4630_54pe-r0/sonic_platform/component.py

@@ -24,7 +24,7 @@
 COMPONENT_LIST= [
    ("CPLD1", "CPLD 1"),
    ("BIOS", "Basic Input/Output System")
-   
+
 ]
 
 class Component(ComponentBase):

device/accton/x86_64-accton_as4630_54pe-r0/sonic_platform/eeprom.py

@@ -6,7 +6,7 @@
         from io import StringIO
     else:
         from cStringIO import StringIO
-    
+
     from sonic_platform_base.sonic_eeprom import eeprom_tlvinfo
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")

device/accton/x86_64-accton_as4630_54pe-r0/sonic_platform/event.py

@@ -5,38 +5,47 @@
 except ImportError as e:
     raise ImportError(repr(e) + " - required module not found")
 
+POLL_INTERVAL_IN_SEC = 1
 
 class SfpEvent:
     ''' Listen to insert/remove sfp events '''
-   
+
     def __init__(self, sfp_list):
         self._api_helper = APIHelper()
         self._sfp_list = sfp_list
         self._logger = Logger()
+        self._sfp_change_event_data = {'present': 0}
 
-    sfp_change_event_data = {'valid': 0, 'last': 0, 'present': 0}
-    def get_sfp_event(self, timeout=2000):
-        now = time.time()
-        port_dict = {}
-        change_dict = {}
-        change_dict['sfp'] = port_dict
-
-        if timeout < 1000:
-            timeout = 1000
-        timeout = timeout / float(1000)  # Convert to secs
-
-        if now < (self.sfp_change_event_data['last'] + timeout) and self.sfp_change_event_data['valid']:
-            return True, change_dict
-        
+    def get_presence_bitmap(self):
         bitmap = 0
         for sfp in self._sfp_list:
             modpres = sfp.get_presence()
             i=sfp.port_num-1
             if modpres:
                 bitmap = bitmap | (1 << i)
+        return bitmap
+
+    def get_sfp_event(self, timeout=2000):
+        port_dict = {}
+        change_dict = {}
+        change_dict['sfp'] = port_dict
 
-        changed_ports = self.sfp_change_event_data['present'] ^ bitmap
-        if changed_ports:
+        if timeout < 1000:
+            cd_ms = 1000
+        else:
+            cd_ms = timeout
+
+        while cd_ms > 0:
+            bitmap = self.get_presence_bitmap()
+            changed_ports = self._sfp_change_event_data['present'] ^ bitmap
+            if changed_ports != 0:
+                break
+            time.sleep(POLL_INTERVAL_IN_SEC)
+            # timeout=0 means wait for event forever
+            if timeout != 0:
+                cd_ms = cd_ms - POLL_INTERVAL_IN_SEC * 1000
+
+        if changed_ports != 0:
             for sfp in self._sfp_list:
                 i=sfp.port_num-1
                 if (changed_ports & (1 << i)):
@@ -47,9 +56,7 @@ def get_sfp_event(self, timeout=2000):
 
 
             # Update the cache dict
-            self.sfp_change_event_data['present'] = bitmap
-            self.sfp_change_event_data['last'] = now
-            self.sfp_change_event_data['valid'] = 1
+            self._sfp_change_event_data['present'] = bitmap
             return True, change_dict
         else:
             return True, change_dict

device/accton/x86_64-accton_as4630_54pe-r0/sonic_platform/psu.py

@@ -9,7 +9,7 @@
 #import sonic_platform
 
 try:
-    from sonic_platform_base.psu_base import PsuBase   
+    from sonic_platform_base.psu_base import PsuBase
     from .helper import APIHelper
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")

device/accton/x86_64-accton_as4630_54pe-r0/sonic_platform/sfp.py

@@ -124,7 +124,7 @@ class Sfp(SfpBase):
     # Path to sysfs
     PLATFORM_ROOT_PATH = "/usr/share/sonic/device"
     PMON_HWSKU_PATH = "/usr/share/sonic/hwsku"
-    HOST_CHK_CMD = "docker > /dev/null 2>&1"
+    HOST_CHK_CMD = "which systemctl > /dev/null 2>&1"
 
     PLATFORM = "x86_64-accton_as4630_54pe-r0"
     HWSKU = "Accton-AS4630-54PE"
@@ -965,7 +965,7 @@ def tx_disable(self, tx_disable):
 
         if self.port_num < 53:
             tx_path = "{}{}{}".format(CPLD_I2C_PATH, '/module_tx_disable_', self.port_num)      
-            ret = self.__write_txt_file(tx_path,  1 if tx_disable else 0)
+            ret = self._api_helper.write_txt_file(tx_path,  1 if tx_disable else 0)
             if ret is not None:
                 time.sleep(0.01)
                 return ret