Remove RIF from m_rifsToAdd before deleting it (sonic-net#3336)

* Remove RIF from m_rifsToAdd before deleting RIF

What I did
I extended the RIF removal functionality to also remove the port from the m_rifsToAdd list.

Why I did it
Typically, the counter and object handling logic follows a strict sequence:

Create an object, then start counter polling.
Stop counter polling, then remove the object.
However, there is deferred logic for RIF counters, where counter polling starts based on a timer rather than immediately.

This process generally works as follows:

Create an object and add it to a list upon receiving an APP_DB update.
Start counter polling for all objects in the list during the timer event.
Stop counter polling for an object.
Remove the object.
If RIF creation and removal occur frequently, removal can happen before the timer event. As a result, the timer may start counter polling for an object that has just been removed, causing the following error message:
ERR syncd#SDK: :- processFlexCounterEvent: port VID oid:0x600000000099d, was not found (probably port was removed/splitted) and will remove from counters now

Author: tshalvi

orchagent/intfsorch.cpp

@@ -1329,8 +1329,21 @@ bool IntfsOrch::removeRouterIntfs(Port &port)
         return false;
     }
 
-    const auto id = sai_serialize_object_id(port.m_rif_id);
-    removeRifFromFlexCounter(id, port.m_alias);
+    bool port_found = false;
+    for (auto it = m_rifsToAdd.begin(); it != m_rifsToAdd.end(); ++it)
+    {
+        if (it->m_rif_id == port.m_rif_id)
+        {
+            m_rifsToAdd.erase(it);
+            port_found = true;
+            break;
+        }
+    }
+    if (!port_found)
+    {
+        const auto id = sai_serialize_object_id(port.m_rif_id);
+        removeRifFromFlexCounter(id, port.m_alias);
+    }
 
     sai_status_t status = sai_router_intfs_api->remove_router_interface(port.m_rif_id);
     if (status != SAI_STATUS_SUCCESS)
@@ -1759,4 +1772,5 @@ void IntfsOrch::voqSyncIntfState(string &alias, bool isUp)
         m_tableVoqSystemInterfaceTable->hset(port_alias, "oper_status", isUp ? "up" : "down");
     }
 
-}
+}
+