Remove handling for unnecessary scenario

sonic-net · Jul 5, 2021 · b4dc2e3 · b4dc2e3
1 parent c340b3e
commit b4dc2e3
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 12 deletions.
diff --git a/orchagent/natorch.cpp b/orchagent/natorch.cpp
@@ -115,7 +115,6 @@ NatOrch::NatOrch(DBConnector *appDb, DBConnector *stateDb, vector<table_name_wit
     if (status != SAI_STATUS_SUCCESS)
     {
         SWSS_LOG_NOTICE("Failed to get the SNAT available entry count, rv:%d", status);
-        handleSaiGetStatus(SAI_API_SWITCH, status);
     }
     else
     {
@@ -3665,7 +3664,6 @@ bool NatOrch::getTwiceNatCounters(const TwiceNatEntry::iterator &iter)
         SWSS_LOG_ERROR("Failed to get Counters for Twice NAT entry [src-ip %s, dst-ip %s], bytes = %" PRIu64 ", pkts = %" PRIu64 "",
                         key.src_ip.to_string().c_str(), key.dst_ip.to_string().c_str(),
                         nat_entry_attr[0].value.u64, nat_entry_attr[1].value.u64);
-        handleSaiGetStatus(SAI_API_NAT, status);
     }
     else
     {

diff --git a/orchagent/routeorch.cpp b/orchagent/routeorch.cpp
@@ -48,11 +48,7 @@ RouteOrch::RouteOrch(DBConnector *db, vector<table_name_with_pri_t> &tableNames,
     {
         SWSS_LOG_WARN("Failed to get switch attribute number of ECMP groups. \
                        Use default value. rv:%d", status);
-        task_process_status handle_status = handleSaiGetStatus(SAI_API_SWITCH, status);
-        if (handle_status != task_process_status::task_success)
-        {
-            m_maxNextHopGroupCount = DEFAULT_NUMBER_OF_ECMP_GROUPS;
-        }
+        m_maxNextHopGroupCount = DEFAULT_NUMBER_OF_ECMP_GROUPS;
     }
     else
     {

diff --git a/orchagent/switchorch.cpp b/orchagent/switchorch.cpp
@@ -360,7 +360,6 @@ void SwitchOrch::doTask(SelectableTimer &timer)
             else
             {
                 SWSS_LOG_ERROR("ASIC sensors : failed to get SAI_SWITCH_ATTR_TEMP_LIST: %d", status);
-                handleSaiGetStatus(SAI_API_SWITCH, status);
             }
         }
 
@@ -385,7 +384,6 @@ void SwitchOrch::doTask(SelectableTimer &timer)
             {
                 m_sensorsMaxTempSupported = false;
                 SWSS_LOG_ERROR("ASIC sensors : failed to get SAI_SWITCH_ATTR_MAX_TEMP: %d", status);
-                handleSaiGetStatus(SAI_API_SWITCH, status);
             }
         }
 
@@ -410,7 +408,6 @@ void SwitchOrch::doTask(SelectableTimer &timer)
             {
                 m_sensorsAvgTempSupported = false;
                 SWSS_LOG_ERROR("ASIC sensors : failed to get SAI_SWITCH_ATTR_AVERAGE_TEMP: %d", status);
-                handleSaiGetStatus(SAI_API_SWITCH, status);
             }
         }
     }
@@ -444,7 +441,6 @@ void SwitchOrch::initSensorsTable()
         else
         {
             SWSS_LOG_ERROR("ASIC sensors : failed to get SAI_SWITCH_ATTR_MAX_NUMBER_OF_TEMP_SENSORS: 0x%x", status);
-            handleSaiGetStatus(SAI_API_SWITCH, status);
         }
     }
 
@@ -469,7 +465,6 @@ void SwitchOrch::initSensorsTable()
         else
         {
             SWSS_LOG_ERROR("ASIC sensors : failed to get SAI_SWITCH_ATTR_TEMP_LIST: %d", status);
-            handleSaiGetStatus(SAI_API_SWITCH, status);
         }
     }