reverting commit f3a6e5b:Add v2r mapping for VoQ counters in VoQ Chassis- #705

[Sreevanich16]

Why I did it

Merged public changes into kubesonic as part of this PR - #229
This specific commit is causing high latency when querying counter db - sonic-net/sonic-gnmi#705

How I did it

Reverting sonic-net/sonic-gnmi#705
and cherry-picked this commit from public to fix build failure - sonic-net/sonic-gnmi#757

How to verify it

Deployed the image containing the fix on couple of canary devices and cross checked there is no high execution time by running watchdog probe and manually triggering offending APIs as well.

Watchdog probe succeeded with new image.

SCHIKKALAWAR@DSM12-0101-0813-06BT0:~$ curl -v http://127.0.0.1:50080
*   Trying 127.0.0.1:50080...
* Connected to 127.0.0.1 (127.0.0.1) port 50080 (#0)
> GET / HTTP/1.1
> Host: 127.0.0.1:50080
> User-Agent: curl/7.88.1
> Accept: */*
> 
< HTTP/1.1 200 OK
< Content-Type: application/json
< Content-Length: 4216
< 
{"check_telemetry_port":"OK","xpath_commands":[{"xpath":"DEVICE_METADATA/localhost/chassis_serial_number","success":true,"error":null,"duration_ms":150},{"xpath":"mac/aging-time","success":true,"error":null,"duration_ms":50},{"xpath":"processes/memory","success":true,"error":null,"duration_ms":250},{"xpath":"interfaces/switchport/status","success":true,"error":null,"duration_ms":100},{"xpath":"dropcounters/counts","success":true,"error":null,"duration_ms":1051},{"xpath":"headroom-pool/persistent-watermark","success":true,"error":null,"duration_ms":50},{"xpath":"srv6/stats","success":true,"error":null,"duration_ms":50},{"xpath":"interfaces/description","success":true,"error":null,"duration_ms":150},{"xpath":"watermark/telemetry/interval","success":true,"error":null,"duration_ms":50},{"xpath":"ipv6/bgp/neighbors","success":true,"error":null,"duration_ms":400},{"xpath":"interfaces/transceiver/presence","success":true,"error":null,"duration_ms":150},{"xpath":"processes","success":true,"error":null,"duration_ms":50},{"xpath":"interfaces/alias","success":true,"error":null,"duration_ms":100},{"xpath":"queue/watermark/all","success":true,"error":null,"duration_ms":250},{"xpath":"clock","success":true,"error":null,"duration_ms":50},{"xpath":"ipv6/bgp/summary","success":true,"error":null,"duration_ms":150},{"xpath":"interfaces/neighbor/expected","success":true,"error":null,"duration_ms":300},{"xpath":"dropcounters/capabilities","success":true,"error":null,"duration_ms":50},{"xpath":"buffer_pool/watermark","success":true,"error":null,"duration_ms":50},{"xpath":"interfaces/status","success":true,"error":null,"duration_ms":651},{"xpath":"ipv6/bgp/network","success":true,"error":null,"duration_ms":400},{"xpath":"interfaces/transceiver/error-status","success":true,"error":null,"duration_ms":100},{"xpath":"interfaces/counters","success":true,"error":null,"duration_ms":300},{"xpath":"headroom-pool/watermark","success":true,"error":null,"duration_ms":50},{"xpath":"clock/timezones","success":true,"error":null,"duration_ms":50},{"xpath":"interfaces/flap","success":true,"error":null,"duration_ms":300},{"xpath":"interfaces/portchannel","success":true,"error":null,"duration_ms":50},{"xpath":"interfaces/switchport/config","success":true,"error":null,"duration_ms":100},{"xpath":"ipv6/fib","success":true,"error":null,"duration_ms":100},{"xpath":"ipv6/interfaces","success":true,"error":null,"duration_ms":100},{"xpath":"ipv6/prefix-list","success":true,"error":null,"duration_ms":200},{"xpath":"ipv6/protocol","success":true,"error":null,"duration_ms":200},{"xpath":"buffer_pool/persistent-watermark","success":true,"error":null,"duration_ms":50},{"xpath":"mac","success":true,"error":null,"duration_ms":50},{"xpath":"mmu","success":true,"error":null,"duration_ms":50},{"xpath":"processes/summary","success":true,"error":null,"duration_ms":100},{"xpath":"queue/wredcounters","success":true,"error":null,"duration_ms":450},{"xpath":"queue/watermark","success":true,"error":null,"duration_ms":50},{"xpath":"queue/watermark/unicast","success":true,"error":null,"duration_ms":250},{"xpath":"queue/counters","success":true,"error":null,"duration_ms":651},{"xpath":"interfaces/fec/status","success":true,"error":null,"duration_ms":250},{"xpath":"queue/watermark/multicast","success":true,"error":null,"duration_ms":250},{"xpath":"system-memory","success":true,"error":null,"duration_ms":50},{"xpath":"ipv6/route","success":true,"error":null,"duration_ms":250},{"xpath":"ipv6/link-local-mode","success":true,"error":null,"duration_ms":100},{"xpath":"lldp/neighbors","success":true,"error":null,"duration_ms":300},{"xpath":"reboot-cause/history","success":true,"error":null,"duration_ms":50},{"xpath":"ecn","success":true,"error":null,"duration_ms":50},{"xpath":"vlan/brief","success":true,"error":null,"duration_ms":50},{"xpath":"uptime","success":true,"error":null,"duration_ms":50},{"xpath":"lldp/table","success":true,"error":null,"duration_ms":450},{"xpath":"version","success":true,"error":null,"duration_ms":100},{"xpath":"dropcounters/configuration","success":true,"error":null,"d* Connection #0 to host 127.0.0.1 left intact
uration_ms":50},{"xpath":"interfaces/naming_mode","success":true,"error":null,"duration_ms":50}],"xpath_load_errors":[]}SCHIKKALAWAR@DSM12-0101-0813-06BT0:~$ 

Watchdog probe timed out with old image-

SCHIKKALAWAR@DSM12-0101-0813-06BT0:~$ curl -v http://127.0.0.1:50080
*   Trying 127.0.0.1:50080...
* Connected to 127.0.0.1 (127.0.0.1) port 50080 (#0)
> GET / HTTP/1.1
> Host: 127.0.0.1:50080
> User-Agent: curl/7.88.1
> Accept: */*
> 
< HTTP/1.1 500 Internal Server Error
< Content-Type: application/json
< Content-Length: 4277
< 
{"check_telemetry_port":"OK","xpath_commands":[{"xpath":"DEVICE_METADATA/localhost/chassis_serial_number","success":true,"error":null,"duration_ms":50},{"xpath":"headroom-pool/persistent-watermark","success":true,"error":null,"duration_ms":1001},{"xpath":"queue/watermark/unicast","success":true,"error":null,"duration_ms":1252},{"xpath":"interfaces/alias","success":true,"error":null,"duration_ms":250},{"xpath":"uptime","success":true,"error":null,"duration_ms":50},{"xpath":"queue/wredcounters","success":true,"error":null,"duration_ms":2904},{"xpath":"ipv6/bgp/summary","success":true,"error":null,"duration_ms":300},{"xpath":"ipv6/fib","success":true,"error":null,"duration_ms":200},{"xpath":"reboot-cause/history","success":true,"error":null,"duration_ms":100},{"xpath":"version","success":true,"error":null,"duration_ms":200},{"xpath":"vlan/brief","success":true,"error":null,"duration_ms":100},{"xpath":"buffer_pool/persistent-watermark","success":true,"error":null,"duration_ms":4456},{"xpath":"ipv6/bgp/neighbors","success":true,"error":null,"duration_ms":250},{"xpath":"lldp/neighbors","success":true,"error":null,"duration_ms":601},{"xpath":"mac/aging-time","success":true,"error":null,"duration_ms":100},{"xpath":"queue/watermark","success":true,"error":null,"duration_ms":100},{"xpath":"ipv6/route","success":true,"error":null,"duration_ms":300},{"xpath":"ipv6/protocol","success":true,"error":null,"duration_ms":300},{"xpath":"interfaces/naming_mode","success":true,"error":null,"duration_ms":100},{"xpath":"srv6/stats","success":false,"error":"gnmi_get timed out","duration_ms":10015},{"xpath":"clock/timezones","success":true,"error":null,"duration_ms":100},{"xpath":"ipv6/prefix-list","success":true,"error":null,"duration_ms":350},{"xpath":"interfaces/description","success":true,"error":null,"duration_ms":851},{"xpath":"mac","success":true,"error":null,"duration_ms":50},{"xpath":"dropcounters/capabilities","success":true,"error":null,"duration_ms":50},{"xpath":"interfaces/counters","success":true,"error":null,"duration_ms":2854},{"xpath":"ipv6/bgp/network","success":true,"error":null,"duration_ms":400},{"xpath":"dropcounters/counts","success":false,"error":"gnmi_get timed out","duration_ms":10014},{"xpath":"processes/summary","success":true,"error":null,"duration_ms":200},{"xpath":"watermark/telemetry/interval","success":true,"error":null,"duration_ms":50},{"xpath":"interfaces/switchport/status","success":true,"error":null,"duration_ms":150},{"xpath":"interfaces/transceiver/presence","success":true,"error":null,"duration_ms":601},{"xpath":"processes/memory","success":true,"error":null,"duration_ms":300},{"xpath":"interfaces/neighbor/expected","success":true,"error":null,"duration_ms":200},{"xpath":"ecn","success":true,"error":null,"duration_ms":100},{"xpath":"buffer_pool/watermark","success":true,"error":null,"duration_ms":5407},{"xpath":"interfaces/fec/status","success":true,"error":null,"duration_ms":901},{"xpath":"queue/counters","success":true,"error":null,"duration_ms":2603},{"xpath":"interfaces/flap","success":true,"error":null,"duration_ms":200},{"xpath":"interfaces/transceiver/error-status","success":true,"error":null,"duration_ms":200},{"xpath":"processes","success":true,"error":null,"duration_ms":100},{"xpath":"interfaces/switchport/config","success":true,"error":null,"duration_ms":200},{"xpath":"dropcounters/configuration","success":true,"error":null,"duration_ms":100},{"xpath":"headroom-pool/watermark","success":true,"error":null,"duration_ms":1101},{"xpath":"ipv6/link-local-mode","success":true,"error":null,"duration_ms":350},{"xpath":"lldp/table","success":true,"error":null,"duration_ms":601},{"xpath":"mmu","success":true,"error":null,"duration_ms":50},{"xpath":"ipv6/interfaces","success":true,"error":null,"duration_ms":200},{"xpath":"queue/watermark/all","success":true,"error":null,"duration_ms":1852},{"xpath":"queue/watermark/multicast","success":true,"error":null,"duration_ms":1101},{"xpath":"interfaces/status","success":true,"error":null,"duration_ms":2503},{"xpath":"clock","success":true,"error":null,"duration_ms* Connection #0 to host 127.0.0.1 left intact
":50},{"xpath":"system-memory","success":true,"error

Which release branch to backport (provide reason below if selected)

• 201811
• 201911
• 202006
• 202012
• 202106
• 202111

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

[azure-pipelines]

Azure Pipelines:
There may be pipelines that require an authorized user to comment /azp run to run.

[Sreevanich16]

/azp run

[azure-pipelines]

Azure Pipelines:
Successfully started running 1 pipeline(s).

[Sreevanich16]

/azp run

[azure-pipelines]

Azure Pipelines:
Successfully started running 1 pipeline(s).

[Vijay Sharma (sharmavijay-ms)]

LGTM