[orchagent] Add trap flow counter support #1951

Junchao-Mellanox · 2021-10-11T07:46:40Z

Added new VS test case in this PR, and the new VS test case requires #1967 and sonic-net/sonic-sairedis#954

What I did

Add trap flow counter support. See HLD: sonic-net/SONiC#858

Why I did it

Flow counters are usually used for debugging, troubleshooting and performance enhancement processes. Host interface trap counter can get number of received traps per Trap ID.

How I verified it

Manual test/VS test/sonic mgmt test

Details if related

Junchao-Mellanox · 2021-10-11T08:04:32Z

Build dependency: sonic-net/sonic-swss-common#534

orchagent/copporch.cpp

prsunny · 2021-10-12T01:58:12Z

@dgsudharsan for review

orchagent/flow_counter/flow_counter_handler.cpp

orchagent/copporch.cpp

orchagent/copporch.h

orchagent/copporch.cpp

orchagent/flexcounterorch.cpp

dgsudharsan · 2021-10-28T00:26:01Z

@Junchao-Mellanox Can you please check the recent changes made based on the comment #1859 (comment)
Please check this commit for reference 7ddb0ab

Junchao-Mellanox · 2021-10-29T01:39:01Z

@Junchao-Mellanox Can you please check the recent changes made based on the comment #1859 (comment) Please check this commit for reference 7ddb0ab

Hi @dgsudharsan , fixed, could you please review and sign off?

orchagent/flow_counter/flow_counter_handler.cpp

orchagent/copporch.cpp

Junchao-Mellanox · 2021-11-26T03:59:25Z

/AzurePipelines run Azure.sonic-swss

azure-pipelines · 2021-11-26T03:59:30Z

Commenter does not have sufficient privileges for PR 1951 in repo Azure/sonic-swss

xumia · 2021-11-26T05:24:49Z

/AzurePipelines run Azure.sonic-swss

azure-pipelines · 2021-11-26T05:24:59Z

Azure Pipelines successfully started running 1 pipeline(s).

xumia · 2021-11-26T05:27:51Z

@Junchao-Mellanox , if you want to trigger a check rerun, please try to use "/azpw run Azure.sonic-swss"

Junchao-Mellanox · 2021-11-26T06:23:36Z

Hi @xumia, sure, thanks.

prsunny · 2021-11-29T18:02:45Z

orchagent/copporch.cpp

 extern bool                 gIsNatSupported;

+#define FLEX_COUNTER_UPD_INTERVAL 1


Please change this to 10.

This interval here is the timer to add flex counter to flex DB, it is not the query interval.

But this is the interval where the select gets triggered, right? So why select this every 1 sec?

Here we use a timer to timely add flex counter to FLEX COUNTER DB due to comment: #1859 (comment) . We set the interval 1 here because we want flex counter to be created as soon as possible. It won't cost much CPU because:

the timer will be started when the first item is added to queue "m_pendingAddToFlexCntr"

when the queue "m_pendingAddToFlexCntr" is empty, the timer will be stopped

Please check copporch.cpp line 770:

auto was_empty = m_pendingAddToFlexCntr.empty(); m_pendingAddToFlexCntr[counter_id] = trap_name; if (was_empty) { m_FlexCounterUpdTimer->start(); }

and copporch.cpp line 1229

if (m_pendingAddToFlexCntr.empty()) { m_FlexCounterUpdTimer->stop(); }

prsunny · 2021-11-29T21:57:58Z

@Junchao-Mellanox , I think we have discussed this before, please do not "close" and "reopen" the PR multiple times. It is not clear whether you really want to close the PR without merging. If the intention is to to retrigger tests, please do "/azpw run".

Junchao-Mellanox · 2021-11-30T03:15:08Z

@Junchao-Mellanox , I think we have discussed this before, please do not "close" and "reopen" the PR multiple times. It is not clear whether you really want to close the PR without merging. If the intention is to to retrigger tests, please do "/azpw run".

Sure

orchagent/flow_counter/flow_counter_handler.cpp

orchagent/flow_counter/flow_counter_handler.h

Junchao-Mellanox · 2021-11-30T03:16:34Z

orchagent/copporch.cpp

 extern bool                 gIsNatSupported;

+#define FLEX_COUNTER_UPD_INTERVAL 1


This interval here is the timer to add flex counter to flex DB, it is not the query interval.

691c37b [Route bulk] Fix bugs in case a SET operation follows a DEL operation in the same bulk (sonic-net/sonic-swss#2086) a4c80c3 patch for issue sonic-net/sonic-swss#1971 - enable Rx Drop handling for cisco-8000 (sonic-net/sonic-swss#2041) 71751d1 [macsec] Support setting IPG by gearbox_config.json (sonic-net/sonic-swss#2051) 5d5c169 [bulk mode] Fix bulk conflict when in case there are both remove and set operations (sonic-net/sonic-swss#2071) 8bbdbd2 Fix SRV6 NHOP CRM object type (sonic-net/sonic-swss#2072) ef5b35f [vstest] VS test failure fix after fabric port orch PR merge (sonic-net/sonic-swss#1811) 89ea538 Supply the missing ingress/egress port profile list in document (sonic-net/sonic-swss#2064) 8123437 [pfc_detect] fix RedisReply errors (sonic-net/sonic-swss#2040) b38f527 [swss][CRM][MPLS] MPLS CRM Nexthop - switch back to using SAI OBJECT rather than SWITCH OBJECT ae061e5 create debug_shell_enable config to enable debug shell (sonic-net/sonic-swss#2060) 45e446d [cbf] Fix max FC value (sonic-net/sonic-swss#2049) b1b5b29 Initial p4orch pytest code. (sonic-net/sonic-swss#2054) d352d5a Update default route status to state DB (sonic-net/sonic-swss#2009) 24a64d6 Orchagent: Integrate P4Orch (sonic-net/sonic-swss#2029) 15a3b6c Delete the IPv6 link-local Neighbor when ipv6 link-local mode is disabled (sonic-net/sonic-swss#1897) ed783e1 [orchagent] Add trap flow counter support (sonic-net/sonic-swss#1951) e9b05a3 [vnetorch] ECMP for vnet tunnel routes with endpoint health monitor (sonic-net/sonic-swss#1955) bcb7d61 P4Orch: inital add of source (sonic-net/sonic-swss#1997) f6f6f86 [mclaglink] fix acl out ports (sonic-net/sonic-swss#2026) fd887bf [Reclaim buffer] Reclaim unused buffer for dynamic buffer model (sonic-net/sonic-swss#1910) 9258978 [orchagent, cfgmgr] Add response publisher and state recording (sonic-net/sonic-swss#1992) 3d862a7 Fixing subport vs test script for subport under VNET (sonic-net/sonic-swss#2048) fb0a5fd Don't handle buffer pool watermark during warm reboot reconciling (sonic-net/sonic-swss#1987) 16d4bcd Routed subinterface enhancements (sonic-net/sonic-swss#1907) 9639db7 [vstest/subintf] Add vs test to validate sub interface ingress to a vnet (sonic-net/sonic-swss#1642) Signed-off-by: Stephen Sun [email protected]

#### What I did * Added "show platform barefoot profile" command * Added "config platform barefoot profile" command * Updated Command Line Reference Guide #### How I did it * Created plugins for Barefoot in show/plugins/barefoot.py and config/plugins/barefoot.py * Updated doc/Command-Reference.md

This reverts commit fa23bfc.

…t#1951)"" (sonic-net#2019) Refer to sonic-net#1951 for details The PR sonic-net#1951 was reverted in sonic-net#2016 because it was thought to be causing the build failure in sonic-swss TestWarmReboot UTs. But it seems the failures in TestWarmReboot are still occurring e.g. sonic-net#2017 [build](https://dev.azure.com/mssonic/build/_build/results?buildId=65653&view=logs&s=859b8d9a-8fd6-5a5c-6f5e-f84f1990894e) I think we can reapply sonic-net#1951 and need to investigate TestWarmReboot tests instability

* Add trap flow counter support. See HLD: sonic-net/SONiC#858 * Flow counters are usually used for debugging, troubleshooting and performance enhancement processes. Host interface trap counter can get number of received traps per Trap ID.

Junchao-Mellanox requested a review from prsunny as a code owner October 11, 2021 07:46

Junchao-Mellanox mentioned this pull request Oct 11, 2021

[flow counters] High level design for trap flow counters support sonic-net/SONiC#858

Merged

Junchao-Mellanox requested a review from keboliu October 11, 2021 08:04

prsunny reviewed Oct 12, 2021

View reviewed changes

orchagent/copporch.cpp Show resolved Hide resolved

dgsudharsan requested changes Oct 15, 2021

View reviewed changes

Junchao-Mellanox force-pushed the flow-counter-review branch from 0fd3c1f to de99b0f Compare October 18, 2021 02:15

Junchao-Mellanox force-pushed the flow-counter-review branch from de99b0f to d2fc67c Compare October 27, 2021 06:58

dgsudharsan previously approved these changes Nov 1, 2021

View reviewed changes

Junchao-Mellanox added 3 commits November 2, 2021 14:23

[orchagent] Add flow counter support

07b9cfa

Fix review comment

98d66be

Fix review comment

43c6e3c

Junchao-Mellanox dismissed dgsudharsan’s stale review via 43c6e3c November 2, 2021 06:24

Junchao-Mellanox force-pushed the flow-counter-review branch from 5e891d3 to 43c6e3c Compare November 2, 2021 06:24

dgsudharsan previously approved these changes Nov 3, 2021

View reviewed changes

Merge remote-tracking branch 'upstream/master' into flow-counter-review

14e70eb

Junchao-Mellanox dismissed dgsudharsan’s stale review via 14e70eb November 12, 2021 01:19

keboliu previously approved these changes Nov 17, 2021

View reviewed changes

Merge branch 'master' into flow-counter-review

5f63a7c

Junchao-Mellanox dismissed keboliu’s stale review via 5f63a7c November 17, 2021 05:13

prsunny reviewed Nov 23, 2021

View reviewed changes

orchagent/flow_counter/flow_counter_handler.cpp Outdated Show resolved Hide resolved

orchagent/copporch.cpp Outdated Show resolved Hide resolved

Fix review comment

9dfc036

Junchao-Mellanox force-pushed the flow-counter-review branch from 4df536e to 9dfc036 Compare November 23, 2021 11:58

dgsudharsan previously approved these changes Nov 23, 2021

View reviewed changes

Make vs test stable

51781ae

Junchao-Mellanox dismissed dgsudharsan’s stale review via 51781ae November 24, 2021 04:15

dgsudharsan previously approved these changes Nov 24, 2021

View reviewed changes

Junchao-Mellanox closed this Nov 26, 2021

Junchao-Mellanox reopened this Nov 26, 2021

Remove debug log to make ARM build pass

f647dc9

dgsudharsan approved these changes Nov 27, 2021

View reviewed changes

prsunny reviewed Nov 29, 2021

View reviewed changes

Junchao-Mellanox commented Nov 30, 2021

View reviewed changes

prsunny approved these changes Dec 1, 2021

View reviewed changes

prsunny merged commit ed783e1 into sonic-net:master Dec 1, 2021

bocon13 mentioned this pull request Dec 1, 2021

Orchagent: Integrate P4Orch #2029

Merged

Junchao-Mellanox deleted the flow-counter-review branch December 1, 2021 06:22

stephenxs mentioned this pull request Dec 1, 2021

[sonic-swss] Submodule update sonic-net/sonic-buildimage#9397

Merged

5 tasks

Junchao-Mellanox added the Request for 202111 Branch label Dec 29, 2021

stephenxs mentioned this pull request Jan 6, 2022

[sonic-swss][202111] Submodule update (#9397) sonic-net/sonic-buildimage#9685

Merged

5 tasks

judyjoseph added the Included in 202111 Branch label Jan 17, 2022

EdenGri pushed a commit to EdenGri/sonic-swss that referenced this pull request Feb 28, 2022

Revert "[Barefoot] Added CLI to list/set P4 profile (sonic-net#1951)"

9f22ed1

This reverts commit fa23bfc.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[orchagent] Add trap flow counter support #1951

[orchagent] Add trap flow counter support #1951

Junchao-Mellanox commented Oct 11, 2021 •

edited

Loading

Junchao-Mellanox commented Oct 11, 2021

prsunny commented Oct 12, 2021

dgsudharsan commented Oct 28, 2021

Junchao-Mellanox commented Oct 29, 2021

Junchao-Mellanox commented Nov 26, 2021

azure-pipelines bot commented Nov 26, 2021

xumia commented Nov 26, 2021

azure-pipelines bot commented Nov 26, 2021

xumia commented Nov 26, 2021

Junchao-Mellanox commented Nov 26, 2021

prsunny Nov 29, 2021

Junchao-Mellanox Nov 30, 2021

prsunny Nov 30, 2021

Junchao-Mellanox Dec 1, 2021

prsunny commented Nov 29, 2021

Junchao-Mellanox commented Nov 30, 2021

Junchao-Mellanox Nov 30, 2021

		extern bool gIsNatSupported;

		#define FLEX_COUNTER_UPD_INTERVAL 1

[orchagent] Add trap flow counter support #1951

[orchagent] Add trap flow counter support #1951

Conversation

Junchao-Mellanox commented Oct 11, 2021 • edited Loading

Junchao-Mellanox commented Oct 11, 2021

prsunny commented Oct 12, 2021

dgsudharsan commented Oct 28, 2021

Junchao-Mellanox commented Oct 29, 2021

Junchao-Mellanox commented Nov 26, 2021

azure-pipelines bot commented Nov 26, 2021

xumia commented Nov 26, 2021

azure-pipelines bot commented Nov 26, 2021

xumia commented Nov 26, 2021

Junchao-Mellanox commented Nov 26, 2021

prsunny Nov 29, 2021

Choose a reason for hiding this comment

Junchao-Mellanox Nov 30, 2021

Choose a reason for hiding this comment

prsunny Nov 30, 2021

Choose a reason for hiding this comment

Junchao-Mellanox Dec 1, 2021

Choose a reason for hiding this comment

prsunny commented Nov 29, 2021

Junchao-Mellanox commented Nov 30, 2021

Junchao-Mellanox Nov 30, 2021

Choose a reason for hiding this comment

Junchao-Mellanox commented Oct 11, 2021 •

edited

Loading