Revert D86687218

Summary:
This diff reverts D86687218
Failing DSF scaling tests

Depends on D86687218

Differential Revision: D91360194

fbshipit-source-id: 406b5143d840c24de5a2312f6953d9a7cbcc61d4

Author: generatedunixname89002005232357

fboss/agent/hw/sai/switch/SaiSwitch.cpp

@@ -886,52 +886,6 @@ bool SaiSwitch::l2LearningModeChangeProhibited() const {
   return getSwitchRunState() >= l2LearningChangeProhibitedAfter;
 }
 
-template <typename LockPolicyT, typename AddrT>
-void SaiSwitch::processRemovedRoutesDelta(
-    const RouterID& routerID,
-    const auto& routesDelta,
-    const LockPolicyT& lockPolicy) {
-  if (!rollbackInProgress_) {
-    // Normal processing order
-    processRemovedDelta(
-        routesDelta,
-        managerTable_->routeManager(),
-        lockPolicy,
-        &SaiRouteManager::removeRoute<AddrT>,
-        routerID);
-  } else {
-    processRemovedRoutesDeltaInReverse<LockPolicyT, AddrT>(
-        routerID, routesDelta, lockPolicy);
-  }
-}
-
-template <typename LockPolicyT, typename AddrT>
-void SaiSwitch::processChangedAndAddedRoutesDelta(
-    const RouterID& routerID,
-    const auto& routesDelta,
-    const LockPolicyT& lockPolicy) {
-  if (!rollbackInProgress_) {
-    // Normal processing order: changed first, then added
-    processChangedDelta(
-        routesDelta,
-        managerTable_->routeManager(),
-        lockPolicy,
-        &SaiRouteManager::changeRoute<AddrT>,
-        routerID);
-    processAddedDelta(
-        routesDelta,
-        managerTable_->routeManager(),
-        lockPolicy,
-        &SaiRouteManager::addRoute<AddrT>,
-        routerID);
-  } else {
-    processChangedRoutesDeltaInReverse<LockPolicyT, AddrT>(
-        routerID, routesDelta, lockPolicy);
-    processAddedRoutesDeltaInReverse<LockPolicyT, AddrT>(
-        routerID, routesDelta, lockPolicy);
-  }
-}
-
 std::shared_ptr<SwitchState> SaiSwitch::stateChangedImpl(
     const std::vector<StateDelta>& deltas) {
   FineGrainedLockPolicy lockPolicy(saiSwitchMutex_);
@@ -994,10 +948,18 @@ std::shared_ptr<SwitchState> SaiSwitch::stateChangedImplLocked(
     for (const auto& routeDelta : fibInfoDelta.getFibsMapDelta()) {
       auto routerID = routeDelta.getOld() ? routeDelta.getOld()->getID()
                                           : routeDelta.getNew()->getID();
-      processRemovedRoutesDelta<LockPolicyT, folly::IPAddressV6>(
-          routerID, routeDelta.getFibDelta<folly::IPAddressV6>(), lockPolicy);
-      processRemovedRoutesDelta<LockPolicyT, folly::IPAddressV4>(
-          routerID, routeDelta.getFibDelta<folly::IPAddressV4>(), lockPolicy);
+      processRemovedDelta(
+          routeDelta.getFibDelta<folly::IPAddressV4>(),
+          managerTable_->routeManager(),
+          lockPolicy,
+          &SaiRouteManager::removeRoute<folly::IPAddressV4>,
+          routerID);
+      processRemovedDelta(
+          routeDelta.getFibDelta<folly::IPAddressV6>(),
+          managerTable_->routeManager(),
+          lockPolicy,
+          &SaiRouteManager::removeRoute<folly::IPAddressV6>,
+          routerID);
     }
   }
 
@@ -1326,14 +1288,46 @@ std::shared_ptr<SwitchState> SaiSwitch::stateChangedImplLocked(
         &SaiFdbManager::addMac);
   }
 
+  auto processV4RoutesChangedAndAddedDelta =
+      [this, &lockPolicy](RouterID rid, const auto& routesDelta) {
+        processChangedDelta(
+            routesDelta,
+            managerTable_->routeManager(),
+            lockPolicy,
+            &SaiRouteManager::changeRoute<folly::IPAddressV4>,
+            rid);
+        processAddedDelta(
+            routesDelta,
+            managerTable_->routeManager(),
+            lockPolicy,
+            &SaiRouteManager::addRoute<folly::IPAddressV4>,
+            rid);
+      };
+
+  auto processV6RoutesChangedAndAddedDelta =
+      [this, &lockPolicy](RouterID rid, const auto& routesDelta) {
+        processChangedDelta(
+            routesDelta,
+            managerTable_->routeManager(),
+            lockPolicy,
+            &SaiRouteManager::changeRoute<folly::IPAddressV6>,
+            rid);
+        processAddedDelta(
+            routesDelta,
+            managerTable_->routeManager(),
+            lockPolicy,
+            &SaiRouteManager::addRoute<folly::IPAddressV6>,
+            rid);
+      };
+
   for (const auto& fibInfoDelta : delta.getFibsInfoDelta()) {
     for (const auto& routeDelta : fibInfoDelta.getFibsMapDelta()) {
       auto routerID = routeDelta.getOld() ? routeDelta.getOld()->getID()
                                           : routeDelta.getNew()->getID();
-      processChangedAndAddedRoutesDelta<LockPolicyT, folly::IPAddressV6>(
-          routerID, routeDelta.getFibDelta<folly::IPAddressV6>(), lockPolicy);
-      processChangedAndAddedRoutesDelta<LockPolicyT, folly::IPAddressV4>(
-          routerID, routeDelta.getFibDelta<folly::IPAddressV4>(), lockPolicy);
+      processV4RoutesChangedAndAddedDelta(
+          routerID, routeDelta.getFibDelta<folly::IPAddressV4>());
+      processV6RoutesChangedAndAddedDelta(
+          routerID, routeDelta.getFibDelta<folly::IPAddressV6>());
     }
   }
   {

fboss/agent/hw/sai/switch/SaiSwitch.h

@@ -695,18 +695,6 @@ class SaiSwitch : public HwSwitch {
       std::optional<cfg::PfcWatchdogRecoveryAction> recoveryAction);
   void setPortOwnershipToAdapter();
 
-  template <typename LockPolicyT, typename AddrT>
-  void processRemovedRoutesDelta(
-      const RouterID& routerID,
-      const auto& routesDelta,
-      const LockPolicyT& lockPolicy);
-
-  template <typename LockPolicyT, typename AddrT>
-  void processChangedAndAddedRoutesDelta(
-      const RouterID& routerID,
-      const auto& routesDelta,
-      const LockPolicyT& lockPolicy);
-
   bool processVlanUntaggedPackets() const;
 
   /* reconstruction state apis */