[debugcounterorch] check if counter type is supported before querying… by stepanblyschak · Pull Request #1789 · sonic-net/sonic-swss

stepanblyschak · 2021-06-17T07:42:06Z

… object availability count

Signed-off-by: Stepan Blyschak stepanb@nvidia.com

DEPENDS: sonic-net/sonic-sairedis#842
ALSO: sonic-net/sonic-sairedis#843

What I did

Implemented check for debug counter type support prio to querying unsupported counter type availablility counter.

Why I did it
This is done in order to prevent error message seen on mellanox platform:

Mar 11 16:28:42.945332 ptr-sonic-n2-t3 ERR syncd#SDK: [SAI_DEBUG_COUNTER.ERR] mlnx_sai_debug_counter.c[324]- mlnx_debug_counter_availability_get: Unsupported debug counter type - 1
Mar 11 16:28:42.948092 ptr-sonic-n2-t3 ERR syncd#SDK: [SAI_DEBUG_COUNTER.ERR] mlnx_sai_debug_counter.c[324]- mlnx_debug_counter_availability_get: Unsupported debug counter type - 0

How I verified it

Run on mellanox and observe no errors.
Run VS test for debug counters:

tests/test_drop_counters.py::TestDropCounters::test_deviceCapabilitiesTablePopulated PASSED               [  6%]
tests/test_drop_counters.py::TestDropCounters::test_flexCounterGroupInitialized PASSED                    [ 12%]
tests/test_drop_counters.py::TestDropCounters::test_createAndRemoveDropCounterBasic PASSED                [ 18%]
tests/test_drop_counters.py::TestDropCounters::test_createAndRemoveDropCounterReversed PASSED             [ 25%]
tests/test_drop_counters.py::TestDropCounters::test_createCounterWithInvalidCounterType PASSED            [ 31%] 
tests/test_drop_counters.py::TestDropCounters::test_createCounterWithInvalidDropReason PASSED             [ 37%]
tests/test_drop_counters.py::TestDropCounters::test_addReasonToInitializedCounter PASSED                  [ 43%]
tests/test_drop_counters.py::TestDropCounters::test_removeReasonFromInitializedCounter PASSED             [ 50%]
tests/test_drop_counters.py::TestDropCounters::test_removeAllDropReasons PASSED                           [ 56%]
tests/test_drop_counters.py::TestDropCounters::test_addDropReasonMultipleTimes PASSED                     [ 62%]
tests/test_drop_counters.py::TestDropCounters::test_addInvalidDropReason PASSED                           [ 68%]
tests/test_drop_counters.py::TestDropCounters::test_removeDropReasonMultipleTimes PASSED                  [ 75%]
tests/test_drop_counters.py::TestDropCounters::test_removeNonexistentDropReason PASSED                    [ 81%]
tests/test_drop_counters.py::TestDropCounters::test_removeInvalidDropReason PASSED                        [ 87%]
tests/test_drop_counters.py::TestDropCounters::test_createAndDeleteMultipleCounters PASSED                [ 93%]
tests/test_drop_counters.py::test_nonflaky_dummy PASSED                                                   [100%]

Details if related

… object availability count Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>

prsunny · 2021-06-17T21:39:11Z

orchagent/debug_counter/drop_counter.cpp

+                                                      SAI_DEBUG_COUNTER_ATTR_TYPE);
+    if (!meta)
+    {
+        SWSS_LOG_THROW("SAI BUG: metadata null pointer returned by "


Please specify ERROR log and return. No need to throw here. Same for below case as well

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>

liat-grozovik · 2021-06-21T07:22:09Z

/azp run

azure-pipelines · 2021-06-21T07:22:26Z

Azure Pipelines successfully started running 1 pipeline(s).

liat-grozovik · 2021-06-21T07:22:26Z

@prsunny could you please review following the fix provided?

liat-grozovik · 2021-06-23T10:25:31Z

/azp run

azure-pipelines · 2021-06-23T10:25:48Z

Azure Pipelines successfully started running 1 pipeline(s).

…x-debugcounters-errors

liat-grozovik · 2021-06-24T12:41:21Z

/azp run

azure-pipelines · 2021-06-24T12:41:37Z

Azure Pipelines successfully started running 1 pipeline(s).

stepanblyschak · 2021-06-24T16:10:50Z

Does pipeline run with latest VS lib implementation?

liat-grozovik · 2021-06-29T08:08:58Z

@prsunny can you please review and approve?

liat-grozovik · 2021-07-07T11:54:30Z

/azp run

azure-pipelines · 2021-07-07T11:54:40Z

Azure Pipelines successfully started running 1 pipeline(s).

liat-grozovik · 2021-07-13T05:57:52Z

/azp run

azure-pipelines · 2021-07-13T05:58:03Z

Azure Pipelines successfully started running 1 pipeline(s).

stepanblyschak · 2021-07-13T15:56:54Z

/azpw run

liat-grozovik · 2021-07-18T11:28:54Z

/azp run

azure-pipelines · 2021-07-18T11:29:04Z

Azure Pipelines successfully started running 1 pipeline(s).

#1789) * [debugcounterorch] check if counter type is supported before querying object availability count Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>

prsunny · 2021-07-21T02:04:31Z

@qiluo-msft, @liat-grozovik , I'm not sure why this alone was marked for 202012. Is this required to be backported? If so, I see that there are dependent PRs in sairedis.

qiluo-msft · 2021-07-21T02:31:26Z

@liat-grozovik Please let me know if this is not required for 202012.

Update submodule for swss f54b7d0b [Dynamic Buffer Calc][202012]Bug fix: Don't create lossless buffer profile for active ports without speed configured (sonic-net/sonic-swss#1820) ac7f5cff Td2: Reclaim buffer from unused ports (sonic-net/sonic-swss#1830) 04105a4b [debugcounterorch] check if counter type is supported before querying (sonic-net/sonic-swss#1789) a67d8af6 [202012][portsorch] fix errors when moving port from one lag to another. (sonic-net/sonic-swss#1819)

This PR includes the following commits a67d8af [202012][portsorch] fix errors when moving port from one lag to another (sonic-net/sonic-swss#1819) 04105a4 [debugcounterorch] check if counter type is supported before querying (sonic-net/sonic-swss#1789) ac7f5cff Td2: Reclaim buffer from unused ports (sonic-net/sonic-swss#1830) f54b7d0 [Dynamic Buffer Calc][202012]Bug fix: Don't create lossless buffer profile for active ports without speed configured (sonic-net/sonic-swss#1820) Signed-off-by: Neetha John <nejo@microsoft.com>

Update sonic-swss submodule head to include below fixes: Ignore ALREADY_EXIST error in FDB creation (sonic-net/sonic-swss#1815) Update MACsec SA PN counter to support SAI API 1.8 (sonic-net/sonic-swss#1818) [swss]: Allow portsyncd to run on system without ports (sonic-net/sonic-swss#1808) [debugcounterorch] check if counter type is supported before querying… (sonic-net/sonic-swss#1789) [configure.ac] Add the option of passing libnl path to configure script (sonic-net/sonic-swss#1824) refactor(fdbsyncd): Convert files with dos2unix (sonic-net/sonic-swss#1828) [VS] Fix for VS test failures (sonic-net/sonic-swss#1836) Td2: Reclaim buffer from unused ports (sonic-net/sonic-swss#1830) [gearbox] Set context for phys based on configs (sonic-net/sonic-swss#1826) [Dynamic Buffer Calc] Bug fix: Don't create lossless buffer profile for active ports without speed configured (sonic-net/sonic-swss#1822) Bridge mac setting, fix statedb time format (sonic-net/sonic-swss#1844) [cfgmgr]: Introduce common libs. (sonic-net/sonic-swss#1842)

…t#8313) Update sonic-swss submodule head to include below fixes: Ignore ALREADY_EXIST error in FDB creation (sonic-net/sonic-swss#1815) Update MACsec SA PN counter to support SAI API 1.8 (sonic-net/sonic-swss#1818) [swss]: Allow portsyncd to run on system without ports (sonic-net/sonic-swss#1808) [debugcounterorch] check if counter type is supported before querying… (sonic-net/sonic-swss#1789) [configure.ac] Add the option of passing libnl path to configure script (sonic-net/sonic-swss#1824) refactor(fdbsyncd): Convert files with dos2unix (sonic-net/sonic-swss#1828) [VS] Fix for VS test failures (sonic-net/sonic-swss#1836) Td2: Reclaim buffer from unused ports (sonic-net/sonic-swss#1830) [gearbox] Set context for phys based on configs (sonic-net/sonic-swss#1826) [Dynamic Buffer Calc] Bug fix: Don't create lossless buffer profile for active ports without speed configured (sonic-net/sonic-swss#1822) Bridge mac setting, fix statedb time format (sonic-net/sonic-swss#1844) [cfgmgr]: Introduce common libs. (sonic-net/sonic-swss#1842)

…querying… (sonic-net#1789)" This reverts commit 04105a4.

…querying… (#1789)" (#1884) This reverts commit 04105a4.

sonic-net#1789) * [debugcounterorch] check if counter type is supported before querying object availability count Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>

[debugcounterorch] check if counter type is supported before querying…

70d19a1

… object availability count Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>

prsunny reviewed Jun 17, 2021

View reviewed changes

change SWSS_LOG_THROW to SWSS_LOG_ERROR

7732ec3

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>

liat-grozovik added Bug 🐛 Request for 202012 Branch labels Jun 23, 2021

Merge branch 'master' of github.com:stepanblyschak/sonic-swss into fi…

a86b028

…x-debugcounters-errors

prsunny approved these changes Jul 3, 2021

View reviewed changes

prsunny merged commit ed6786d into sonic-net:master Jul 20, 2021

qiluo-msft added the Included in 202012 Branch label Jul 20, 2021

stephenxs mentioned this pull request Jul 29, 2021

[sonic-swss][202012] Update submodule sonic-net/sonic-buildimage#8286

Merged

5 tasks

neethajohn mentioned this pull request Jul 29, 2021

[sonic-swss] [202012] Advance submodule sonic-net/sonic-buildimage#8288

Merged

5 tasks

vaibhavhd mentioned this pull request Aug 2, 2021

[advance submodule] Update sonic-swss master head to latest sonic-net/sonic-buildimage#8313

Merged

5 tasks

prsunny mentioned this pull request Aug 23, 2021

[buffer orch] Bugfix: Don't query counter SAI_BUFFER_POOL_STAT_XOFF_ROOM_WATERMARK_BYTES on a pool where it is not supported #1857

Merged

prsunny added a commit to prsunny/sonic-swss that referenced this pull request Aug 25, 2021

Revert "[debugcounterorch] check if counter type is supported before …

3ba2cda

…querying… (sonic-net#1789)" This reverts commit 04105a4.

prsunny mentioned this pull request Aug 25, 2021

Revert "[debugcounterorch] check if counter type is supported #1884

Merged

qiluo-msft pushed a commit that referenced this pull request Aug 26, 2021

Revert "[debugcounterorch] check if counter type is supported before …

8471f42

…querying… (#1789)" (#1884) This reverts commit 04105a4.

Conversation

stepanblyschak commented Jun 17, 2021

Uh oh!

prsunny Jun 17, 2021

Choose a reason for hiding this comment

Uh oh!

stepanblyschak Jun 18, 2021

Choose a reason for hiding this comment

Uh oh!

liat-grozovik commented Jun 21, 2021

Uh oh!

azure-pipelines bot commented Jun 21, 2021

Uh oh!

liat-grozovik commented Jun 21, 2021

Uh oh!

liat-grozovik commented Jun 23, 2021

Uh oh!

azure-pipelines bot commented Jun 23, 2021

Uh oh!

liat-grozovik commented Jun 24, 2021

Uh oh!

azure-pipelines bot commented Jun 24, 2021

Uh oh!

stepanblyschak commented Jun 24, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

liat-grozovik commented Jun 29, 2021

Uh oh!

liat-grozovik commented Jul 7, 2021

Uh oh!

azure-pipelines bot commented Jul 7, 2021

Uh oh!

liat-grozovik commented Jul 13, 2021

Uh oh!

azure-pipelines bot commented Jul 13, 2021

Uh oh!

stepanblyschak commented Jul 13, 2021

Uh oh!

liat-grozovik commented Jul 18, 2021

Uh oh!

azure-pipelines bot commented Jul 18, 2021

Uh oh!

prsunny commented Jul 21, 2021

Uh oh!

qiluo-msft commented Jul 21, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

stepanblyschak commented Jun 24, 2021 •

edited

Loading