Skip to content

Commit 3ceb819

Browse files
committed
updated as per latest review comments
updated as per latest review comments
1 parent f17b20e commit 3ceb819

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

orchagent/fdborch.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1185,7 +1185,7 @@ bool FdbOrch::removeFdbEntry(const FdbEntry& entry, FdbOrigin origin)
11851185
* but we should not delete this mac here since now
11861186
* mac in orchagent represents locally learnt
11871187
*/
1188-
SWSS_LOG_NOTICE("FdbOrch RemoveFDBEntry: mac=%s fdb origin is different; found_origin:%d delete_origin:%d",
1188+
SWSS_LOG_INFO("FdbOrch RemoveFDBEntry: mac=%s fdb origin is different; found_origin:%d delete_origin:%d",
11891189
entry.mac.to_string().c_str(), fdbData.origin, origin);
11901190

11911191
/* We may still have the mac in saved-fdb probably due to unavailability
@@ -1212,7 +1212,7 @@ bool FdbOrch::removeFdbEntry(const FdbEntry& entry, FdbOrigin origin)
12121212
return true; //FIXME: it should be based on status. Some could be retried. some not
12131213
}
12141214

1215-
SWSS_LOG_NOTICE("Removed mac=%s bv_id=0x%lx port:%s",
1215+
SWSS_LOG_INFO("Removed mac=%s bv_id=0x%lx port:%s",
12161216
entry.mac.to_string().c_str(), entry.bv_id, port.m_alias.c_str());
12171217

12181218
port.m_fdb_count--;
@@ -1264,7 +1264,7 @@ void FdbOrch::deleteFdbEntryFromSavedFDB(const MacAddress &mac,
12641264
{
12651265
if (iter->fdbData.origin == origin)
12661266
{
1267-
SWSS_LOG_NOTICE("FDB entry found in saved fdb. deleting..."
1267+
SWSS_LOG_INFO("FDB entry found in saved fdb. deleting..."
12681268
"mac=%s vlan_id=0x%x origin:%d port:%s",
12691269
mac.to_string().c_str(), vlanId, origin,
12701270
itr.first.c_str());
@@ -1275,7 +1275,7 @@ void FdbOrch::deleteFdbEntryFromSavedFDB(const MacAddress &mac,
12751275
}
12761276
else
12771277
{
1278-
SWSS_LOG_NOTICE("FDB entry found in saved fdb, but Origin is "
1278+
SWSS_LOG_INFO("FDB entry found in saved fdb, but Origin is "
12791279
"different mac=%s vlan_id=0x%x reqOrigin:%d "
12801280
"foundOrigin:%d port:%s, IGNORED",
12811281
mac.to_string().c_str(), vlanId, origin,

orchagent/portsorch.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -1882,7 +1882,6 @@ bool PortsOrch::initPort(const string &alias, const int index, const set<int> &l
18821882
/* Add port to port list */
18831883
m_portList[alias] = p;
18841884
m_portOidToIndex[id] = index;
1885-
m_port_ref_count[alias] = 0;
18861885

18871886
/* Add port name map to counter table */
18881887
FieldValueTuple tuple(p.m_alias, sai_serialize_object_id(p.m_port_id));

orchagent/portsorch.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include "observer.h"
1010
#include "macaddress.h"
1111
#include "producertable.h"
12-
#include "notificationproducer.h"
1312
#include "flex_counter_manager.h"
1413
#include "gearboxutils.h"
1514
#include "saihelper.h"
@@ -171,7 +170,7 @@ class PortsOrch : public Orch, public Subject
171170
Port m_cpuPort;
172171
// TODO: Add Bridge/Vlan class
173172
sai_object_id_t m_default1QBridge;
174-
sai_object_id_t m_defaultVlan;
173+
sai_object_id_t m_defaultVlan;
175174

176175
typedef enum
177176
{
@@ -200,7 +199,6 @@ class PortsOrch : public Orch, public Subject
200199
map<set<int>, tuple<string, uint32_t, int, string, int>> m_lanesAliasSpeedMap;
201200
map<string, Port> m_portList;
202201
unordered_map<sai_object_id_t, int> m_portOidToIndex;
203-
204202
map<string, uint32_t> m_port_ref_count;
205203
unordered_set<string> m_pendingPortSet;
206204

0 commit comments

Comments
 (0)