[DASH] Add support for ENI counters #3266

vivekrnv · 2024-08-24T06:20:05Z

What I did

Depends on sonic-net/sonic-sairedis#1418

Added support for ENI Counters
Refactored Flex Counter VS test to move the common infra logic and re-use in the dash vs tests

Why I did it

How I verified it

Add a VS test
Test Counters creation in VS Setup

Enable Flex Counter Creation:

<Enable FC for ENI>
sonic-db-cli CONFIG_DB HSET "FLEX_COUNTER_TABLE|ENI" FLEX_COUNTER_STATUS enable

<Check the FC Group Entry>
sonic-db-cli FLEX_COUNTER_DB HGETALL FLEX_COUNTER_GROUP_TABLE:ENI_STAT_COUNTER
{'POLL_INTERVAL': '10000', 'STATS_MODE': 'STATS_MODE_READ', 'FLEX_COUNTER_STATUS': 'enable'}

<Check the Counter ID list>
sonic-db-cli FLEX_COUNTER_DB HGETALL FLEX_COUNTER_TABLE:ENI_STAT_COUNTER:oid:0x76000000000027
{'ENI_COUNTER_ID_LIST': 'SAI_ENI_STAT_TIMED_FLOW_DELETE_ACK_FAILED_RECV,SAI_ENI_STAT_TIMED_FLOW_DELETE_REQ_FAILED,SAI_ENI_STAT_TIMED_FLOW_DELETE_REQ_RECV,SAI_ENI_STAT_TIMED_FLOW_DELETE_REQ_SENT,SAI_ENI_STAT_INLINE_FLOW_DELETE_ACK_FAILED_RECV,SAI_ENI_STAT_INBOUND_RX_PACKETS,SAI_ENI_STAT_TIMED_SYNC_PACKET_RX_BYTES,SAI_ENI_STAT_INLINE_SYNC_PACKET_TX_BYTES,SAI_ENI_STAT_TIMED_FLOW_CREATE_REQ_SENT,SAI_ENI_STAT_INLINE_FLOW_UPDATE_ACK_IGNORED_RECV,SAI_ENI_STAT_FLOW_DELETED,SAI_ENI_STAT_INLINE_FLOW_DELETE_ACK_IGNORED_RECV,SAI_ENI_STAT_LB_FAST_PATH_ICMP_IN_BYTES,SAI_ENI_STAT_FLOW_UPDATE_BY_RESIMULATION_FAILED,SAI_ENI_STAT_TIMED_FLOW_DELETE_ACK_RECV,SAI_ENI_STAT_FLOW_UPDATED,SAI_ENI_STAT_OUTBOUND_TX_PACKETS,SAI_ENI_STAT_INLINE_SYNC_PACKET_RX_BYTES,SAI_ENI_STAT_TIMED_SYNC_PACKET_TX_BYTES,SAI_ENI_STAT_TIMED_FLOW_UPDATE_REQ_SENT,SAI_ENI_STAT_TIMED_FLOW_UPDATE_ACK_FAILED_RECV,SAI_ENI_STAT_FLOW_CREATE_FAILED,SAI_ENI_STAT_INLINE_FLOW_CREATE_ACK_RECV,SAI_ENI_STAT_RX_PACKETS,SAI_ENI_STAT_INBOUND_RX_BYTES,SAI_ENI_STAT_INLINE_SYNC_PACKET_RX_PACKETS,SAI_ENI_STAT_INLINE_FLOW_CREATE_ACK_IGNORED_RECV,SAI_ENI_STAT_TX_BYTES,SAI_ENI_STAT_INLINE_FLOW_DELETE_REQ_FAILED,SAI_ENI_STAT_FLOW_AGED,SAI_ENI_STAT_FLOW_UPDATE_FAILED,SAI_ENI_STAT_OUTBOUND_RX_BYTES,SAI_ENI_STAT_INBOUND_TX_BYTES,SAI_ENI_STAT_OUTBOUND_RX_PACKETS,SAI_ENI_STAT_RX_BYTES,SAI_ENI_STAT_LB_FAST_PATH_ICMP_IN_PACKETS,SAI_ENI_STAT_INBOUND_TX_PACKETS,SAI_ENI_STAT_FLOW_CREATED,SAI_ENI_STAT_INLINE_FLOW_UPDATE_REQ_FAILED,SAI_ENI_STAT_TIMED_SYNC_PACKET_TX_PACKETS,SAI_ENI_STAT_INLINE_FLOW_UPDATE_REQ_SENT,SAI_ENI_STAT_TIMED_FLOW_UPDATE_ACK_IGNORED_RECV,SAI_ENI_STAT_FLOW_DELETE_FAILED,SAI_ENI_STAT_INLINE_FLOW_CREATE_REQ_SENT,SAI_ENI_STAT_INLINE_FLOW_CREATE_REQ_RECV,SAI_ENI_STAT_TIMED_FLOW_CREATE_REQ_RECV,SAI_ENI_STAT_TIMED_FLOW_UPDATE_REQ_RECV,SAI_ENI_STAT_INLINE_FLOW_CREATE_REQ_FAILED,SAI_ENI_STAT_INLINE_FLOW_DELETE_ACK_RECV,SAI_ENI_STAT_INLINE_FLOW_CREATE_ACK_FAILED_RECV,SAI_ENI_STAT_TIMED_SYNC_PACKET_RX_PACKETS,SAI_ENI_STAT_FLOW_UPDATED_BY_RESIMULATION,SAI_ENI_STAT_TIMED_FLOW_CREATE_ACK_RECV,SAI_ENI_STAT_INLINE_FLOW_DELETE_REQ_RECV,SAI_ENI_STAT_TIMED_FLOW_CREATE_ACK_FAILED_RECV,SAI_ENI_STAT_INLINE_FLOW_UPDATE_REQ_RECV,SAI_ENI_STAT_INLINE_SYNC_PACKET_TX_PACKETS,SAI_ENI_STAT_TIMED_FLOW_CREATE_ACK_IGNORED_RECV,SAI_ENI_STAT_TIMED_FLOW_DELETE_ACK_IGNORED_RECV,SAI_ENI_STAT_OUTBOUND_TX_BYTES,SAI_ENI_STAT_INLINE_FLOW_UPDATE_ACK_RECV,SAI_ENI_STAT_INLINE_FLOW_UPDATE_ACK_FAILED_RECV,SAI_ENI_STAT_TIMED_FLOW_CREATE_REQ_FAILED,SAI_ENI_STAT_TIMED_FLOW_UPDATE_REQ_FAILED,SAI_ENI_STAT_TIMED_FLOW_UPDATE_ACK_RECV,SAI_ENI_STAT_TX_PACKETS,SAI_ENI_STAT_INLINE_FLOW_DELETE_REQ_SENT'}

sonic-db-cli COUNTERS_DB HGETALL "COUNTERS_ENI_NAME_MAP"
{'eth0': 'oid:0x76000000000027'}

sonic-db-cli COUNTERS_DB hgetall COUNTERS:oid:0x76000000000027
{'SAI_ENI_STAT_TIMED_FLOW_DELETE_ACK_FAILED_RECV': '0', 'SAI_ENI_STAT_TIMED_FLOW_DELETE_REQ_FAILED': '0', 'SAI_ENI_STAT_TIMED_FLOW_DELETE_REQ_RECV': '0', 'SAI_ENI_STAT_TIMED_FLOW_DELETE_REQ_SENT': '0', 'SAI_ENI_STAT_INLINE_FLOW_DELETE_ACK_FAILED_RECV': '0', 'SAI_ENI_STAT_INBOUND_RX_PACKETS': '0', 'SAI_ENI_STAT_TIMED_SYNC_PACKET_RX_BYTES': '0', 'SAI_ENI_STAT_INLINE_SYNC_PACKET_TX_BYTES': '0', 'SAI_ENI_STAT_TIMED_FLOW_CREATE_REQ_SENT': '0', 'SAI_ENI_STAT_INLINE_FLOW_UPDATE_ACK_IGNORED_RECV': '0', 'SAI_ENI_STAT_FLOW_DELETED': '0', 'SAI_ENI_STAT_INLINE_FLOW_DELETE_ACK_IGNORED_RECV': '0', 'SAI_ENI_STAT_LB_FAST_PATH_ICMP_IN_BYTES': '0', 'SAI_ENI_STAT_FLOW_UPDATE_BY_RESIMULATION_FAILED': '0', 'SAI_ENI_STAT_TIMED_FLOW_DELETE_ACK_RECV': '0', 'SAI_ENI_STAT_FLOW_UPDATED': '0', 'SAI_ENI_STAT_OUTBOUND_TX_PACKETS': '0', 'SAI_ENI_STAT_INLINE_SYNC_PACKET_RX_BYTES': '0', 'SAI_ENI_STAT_TIMED_SYNC_PACKET_TX_BYTES': '0', 'SAI_ENI_STAT_TIMED_FLOW_UPDATE_REQ_SENT': '0', 'SAI_ENI_STAT_TIMED_FLOW_UPDATE_ACK_FAILED_RECV': '0', 'SAI_ENI_STAT_FLOW_CREATE_FAILED': '0', 'SAI_ENI_STAT_INLINE_FLOW_CREATE_ACK_RECV': '0', 'SAI_ENI_STAT_RX_PACKETS': '0', 'SAI_ENI_STAT_INBOUND_RX_BYTES': '0', 'SAI_ENI_STAT_INLINE_SYNC_PACKET_RX_PACKETS': '0', 'SAI_ENI_STAT_INLINE_FLOW_CREATE_ACK_IGNORED_RECV': '0', 'SAI_ENI_STAT_TX_BYTES': '0', 'SAI_ENI_STAT_INLINE_FLOW_DELETE_REQ_FAILED': '0', 'SAI_ENI_STAT_FLOW_AGED': '0', 'SAI_ENI_STAT_FLOW_UPDATE_FAILED': '0', 'SAI_ENI_STAT_OUTBOUND_RX_BYTES': '0', 'SAI_ENI_STAT_INBOUND_TX_BYTES': '0', 'SAI_ENI_STAT_OUTBOUND_RX_PACKETS': '0', 'SAI_ENI_STAT_RX_BYTES': '0', 'SAI_ENI_STAT_LB_FAST_PATH_ICMP_IN_PACKETS': '0', 'SAI_ENI_STAT_INBOUND_TX_PACKETS': '0', 'SAI_ENI_STAT_FLOW_CREATED': '0', 'SAI_ENI_STAT_INLINE_FLOW_UPDATE_REQ_FAILED': '0', 'SAI_ENI_STAT_TIMED_SYNC_PACKET_TX_PACKETS': '0', 'SAI_ENI_STAT_INLINE_FLOW_UPDATE_REQ_SENT': '0', 'SAI_ENI_STAT_TIMED_FLOW_UPDATE_ACK_IGNORED_RECV': '0', 'SAI_ENI_STAT_FLOW_DELETE_FAILED': '0', 'SAI_ENI_STAT_INLINE_FLOW_CREATE_REQ_SENT': '0', 'SAI_ENI_STAT_INLINE_FLOW_CREATE_REQ_RECV': '0', 'SAI_ENI_STAT_TIMED_FLOW_CREATE_REQ_RECV': '0', 'SAI_ENI_STAT_TIMED_FLOW_UPDATE_REQ_RECV': '0', 'SAI_ENI_STAT_INLINE_FLOW_CREATE_REQ_FAILED': '0', 'SAI_ENI_STAT_INLINE_FLOW_DELETE_ACK_RECV': '0', 'SAI_ENI_STAT_INLINE_FLOW_CREATE_ACK_FAILED_RECV': '0', 'SAI_ENI_STAT_TIMED_SYNC_PACKET_RX_PACKETS': '0', 'SAI_ENI_STAT_FLOW_UPDATED_BY_RESIMULATION': '0', 'SAI_ENI_STAT_TIMED_FLOW_CREATE_ACK_RECV': '0', 'SAI_ENI_STAT_INLINE_FLOW_DELETE_REQ_RECV': '0', 'SAI_ENI_STAT_TIMED_FLOW_CREATE_ACK_FAILED_RECV': '0', 'SAI_ENI_STAT_INLINE_FLOW_UPDATE_REQ_RECV': '0', 'SAI_ENI_STAT_INLINE_SYNC_PACKET_TX_PACKETS': '0', 'SAI_ENI_STAT_TIMED_FLOW_CREATE_ACK_IGNORED_RECV': '0', 'SAI_ENI_STAT_TIMED_FLOW_DELETE_ACK_IGNORED_RECV': '0', 'SAI_ENI_STAT_OUTBOUND_TX_BYTES': '0', 'SAI_ENI_STAT_INLINE_FLOW_UPDATE_ACK_RECV': '0', 'SAI_ENI_STAT_INLINE_FLOW_UPDATE_ACK_FAILED_RECV': '0', 'SAI_ENI_STAT_TIMED_FLOW_CREATE_REQ_FAILED': '0', 'SAI_ENI_STAT_TIMED_FLOW_UPDATE_REQ_FAILED': '0', 'SAI_ENI_STAT_TIMED_FLOW_UPDATE_ACK_RECV': '0', 'SAI_ENI_STAT_TX_PACKETS': '0', 'SAI_ENI_STAT_INLINE_FLOW_DELETE_REQ_SENT': '0'}

Details if related

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

vivekrnv · 2024-09-18T15:22:12Z

/azpw run Azure.sonic-swss

mssonicbld · 2024-09-18T15:22:15Z

/AzurePipelines run Azure.sonic-swss

azure-pipelines · 2024-09-18T15:22:26Z

Azure Pipelines successfully started running 1 pipeline(s).

vivekrnv · 2024-09-18T22:28:02Z

/azpw run Azure.sonic-swss

mssonicbld · 2024-09-18T22:28:04Z

/AzurePipelines run Azure.sonic-swss

azure-pipelines · 2024-09-18T22:28:14Z

Azure Pipelines successfully started running 1 pipeline(s).

vivekrnv · 2024-09-19T08:22:29Z

/azpw run Azure.sonic-swss

mssonicbld · 2024-09-19T08:22:32Z

/AzurePipelines run Azure.sonic-swss

azure-pipelines · 2024-09-19T08:22:43Z

Azure Pipelines successfully started running 1 pipeline(s).

orchagent/saihelper.cpp

KrisNey-MSFT · 2024-10-04T18:48:24Z

looks like branch is out of date w/base @vivekrnv

KrisNey-MSFT · 2024-10-09T22:47:52Z

Ok to merge this since @dgsudharsan approved last week?

vivekrnv · 2024-10-17T02:07:36Z

@prabhataravind @theasianpianist @prsunny Can we finish the review on this?

vivekrnv · 2024-10-18T23:23:31Z

/azpw run Azure.sonic-swss

mssonicbld · 2024-10-18T23:23:33Z

/AzurePipelines run Azure.sonic-swss

azure-pipelines · 2024-10-18T23:23:44Z

Azure Pipelines successfully started running 1 pipeline(s).

vivekrnv · 2024-10-18T23:27:10Z

/azpw run Azure.sonic-swss

mssonicbld · 2024-10-18T23:27:12Z

/AzurePipelines run Azure.sonic-swss

azure-pipelines · 2024-10-18T23:27:21Z

Azure Pipelines successfully started running 1 pipeline(s).

theasianpianist · 2024-10-23T01:58:40Z

orchagent/dash/dashorch.cpp

+
+    m_eni_name_table->hdel("", name);
+    m_eni_stat_manager.clearCounterIdList(oid);
+    SWSS_LOG_DEBUG("Unregistered eni %s to Flex counter", name.c_str());


Do we need to set m_eni_fc_status to false here?

not required, this is set in handleFCStatusUpdate if the request comes from DB/user

vivekrnv · 2024-11-02T23:39:17Z

@prsunny, @dgsudharsan Can this be merged?

vivekrnv requested a review from prsunny as a code owner August 24, 2024 06:20

vivekrnv requested a review from dgsudharsan August 26, 2024 17:05

dgsudharsan previously approved these changes Aug 26, 2024

View reviewed changes

prsunny requested a review from prabhataravind September 10, 2024 22:52

vivekrnv mentioned this pull request Sep 14, 2024

[DASH] Add support for ENI counters sonic-net/sonic-buildimage#19997

Merged

11 tasks

vivekrnv added 3 commits September 14, 2024 16:18

Add support for DASH ENI counters

f12aaa8

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

Reserve the size before populating the vector

2ed0439

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

Remove Flex Counter before removing the ENI object

1b57392

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

vivekrnv dismissed dgsudharsan’s stale review via 1b57392 September 14, 2024 16:19

vivekrnv force-pushed the eni_cntrs branch from efb8aba to 1b57392 Compare September 14, 2024 16:19

Use the dvs object from dash_db

9735f87

dgsudharsan previously approved these changes Sep 18, 2024

View reviewed changes

prabhataravind reviewed Sep 19, 2024

View reviewed changes

orchagent/saihelper.cpp Show resolved Hide resolved

Add null check after metadata object type check

8d1db6c

vivekrnv dismissed dgsudharsan’s stale review via 8d1db6c September 19, 2024 20:49

vivekrnv requested a review from prabhataravind September 20, 2024 01:56

prsunny requested a review from theasianpianist September 23, 2024 16:36

Merge branch 'master' into eni_cntrs

aba34fb

dgsudharsan approved these changes Oct 4, 2024

View reviewed changes

Merge branch 'master' into eni_cntrs

144d68b

Merge branch 'master' into eni_cntrs

83c36a7

Merge branch 'master' into eni_cntrs

1c35d82

theasianpianist reviewed Oct 23, 2024

View reviewed changes

vivekrnv added 2 commits October 23, 2024 09:53

Merge branch 'master' into eni_cntrs

1f96cb8

Merge branch 'master' into eni_cntrs

ab7bf71

theasianpianist approved these changes Nov 1, 2024

View reviewed changes

Merge branch 'master' into eni_cntrs

26d332c

dgsudharsan merged commit 3e7b9b4 into sonic-net:master Nov 4, 2024
17 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[DASH] Add support for ENI counters #3266

[DASH] Add support for ENI counters #3266

vivekrnv commented Aug 24, 2024 •

edited

Loading

vivekrnv commented Sep 18, 2024

mssonicbld commented Sep 18, 2024

azure-pipelines bot commented Sep 18, 2024

vivekrnv commented Sep 18, 2024

mssonicbld commented Sep 18, 2024

azure-pipelines bot commented Sep 18, 2024

vivekrnv commented Sep 19, 2024

mssonicbld commented Sep 19, 2024

azure-pipelines bot commented Sep 19, 2024

KrisNey-MSFT commented Oct 4, 2024

KrisNey-MSFT commented Oct 9, 2024

vivekrnv commented Oct 17, 2024

vivekrnv commented Oct 18, 2024

mssonicbld commented Oct 18, 2024

azure-pipelines bot commented Oct 18, 2024

vivekrnv commented Oct 18, 2024

mssonicbld commented Oct 18, 2024

azure-pipelines bot commented Oct 18, 2024

theasianpianist Oct 23, 2024

vivekrnv Oct 23, 2024

vivekrnv commented Nov 2, 2024

[DASH] Add support for ENI counters #3266

[DASH] Add support for ENI counters #3266

Conversation

vivekrnv commented Aug 24, 2024 • edited Loading

vivekrnv commented Sep 18, 2024

mssonicbld commented Sep 18, 2024

azure-pipelines bot commented Sep 18, 2024

vivekrnv commented Sep 18, 2024

mssonicbld commented Sep 18, 2024

azure-pipelines bot commented Sep 18, 2024

vivekrnv commented Sep 19, 2024

mssonicbld commented Sep 19, 2024

azure-pipelines bot commented Sep 19, 2024

KrisNey-MSFT commented Oct 4, 2024

KrisNey-MSFT commented Oct 9, 2024

vivekrnv commented Oct 17, 2024

vivekrnv commented Oct 18, 2024

mssonicbld commented Oct 18, 2024

azure-pipelines bot commented Oct 18, 2024

vivekrnv commented Oct 18, 2024

mssonicbld commented Oct 18, 2024

azure-pipelines bot commented Oct 18, 2024

theasianpianist Oct 23, 2024

Choose a reason for hiding this comment

vivekrnv Oct 23, 2024

Choose a reason for hiding this comment

vivekrnv commented Nov 2, 2024

vivekrnv commented Aug 24, 2024 •

edited

Loading