Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[sai and sairedis] advance sairedis sub-module and upgrade to matching Broadcom SAI build #2488

Merged
merged 4 commits into from
Feb 16, 2019

Conversation

yxieca
Copy link
Contributor

@yxieca yxieca commented Jan 25, 2019

- What I did

  • Upgrade Broadcom SAI to 3.3.4.3m-1
  • Advance sairedis sub-module head.

@lguohan
Copy link
Collaborator

lguohan commented Jan 25, 2019

need to update the swss submodule sonic-net/sonic-swss@e84a6ab

yxieca and others added 4 commits February 16, 2019 02:58
This is SAI 3.3.4.3m-3 compiled with SAI header file at commit ID
6ad3382217ec22f64cd268faefcbc2ff7caba4fd of SAI repo.

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
Signed-off-by: Guohan Lu <gulv@microsoft.com>
swss

* a6d60f2 2019-02-15 | Create egress ACL table group during the PFCWD stats list installment (sonic-net#787) (HEAD, origin/master, origin/HEAD) [Wenda Ni]
* 52de963 2019-02-15 | [fpmsyncd] Add VNET routes support (sonic-net#772) [Wei Bai]
* d27f49e 2019-02-13 | Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABLE_TABLE (sonic-net#786) [Jipan Yang]
* 6363985 2019-02-08 | [vstest]: Potential fix for timing issue in warm_reboot's routing UT (sonic-net#788) [Rodny Molina]
* 6d5424d 2019-02-07 | VNet/Vxlan delete handling (sonic-net#766) [Prince Sunny]
* d680ce2 2019-02-07 | [neighsyncd] increase neighbor syncd restore timeout to 110 seconds (sonic-net#745) [Ying Xie]
* b78cc8d 2019-02-01 | support 8 lanes for a physical port (sonic-net#778) [lguohan]
* 73b620c 2019-02-01 | Increase the watermark polling interval to 10s (sonic-net#777) [Wenda Ni]
* a2b987b 2019-02-01 | [vstest]: fix test_speed.py (sonic-net#780) [lguohan]
* cef4bd0 2019-02-01 | [vstest]: fix test_port_an_warm.py test (sonic-net#779) [lguohan]
* 9f20eda 2019-02-01 | fix a unstable swss egress acl test (sonic-net#776) [Kebo Liu]
* 316ae6c 2019-01-30 | portsorch ports init done flag should means buffer, autoneg, speed, m… (sonic-net#747) [Jipan Yang]
* 4280036 2019-01-30 | [teammgrd] Fix inconsistent port admin status (sonic-net#755) [Jipan Yang]
* cf12bdf 2019-01-30 | Remove AclTableGroup upon removal of port/lag/vlan (sonic-net#751) [Jipan Yang]
* 5779c1a 2019-01-29 | [aclorch] Remove  L4 port range support limitation on egress ACL table and add new SWSS virtual test. (sonic-net#741) [Kebo Liu]
* 36e85eb 2019-01-29 | On a routing vlan, the neighbor entry in the /31 subnet is not added to hardware (sonic-net#771) [Kiran Kumar Kella]
* 882ccc6 2019-01-24 | [vnetorch] Change logic for adding VNet interface (sonic-net#761) [Marian Pritsak]
* f637557 2019-01-25 | [vrfmgrd] Fix VRF is not set to VRF_TABLE in APP_DB correctly (sonic-net#768) [yorke]
* e84a6ab 2019-01-24 | use sai_stat_id_t for new SAI header file (sonic-net#769) [lguohan]

sairedis

* d685e35 2019-02-15 | Add support for fdb_event MOVE and check fdb event oids (sonic-net#420) (HEAD, origin/master, origin/HEAD) [Kamil Cudnik]
* 2b91013 2019-02-15 | [vslib] add missing port attributes for virtual switch (sonic-net#419) [Stepan Blyshchak]
* dcc8688 2019-02-14 | Add more specific logic for ingress ACL and buffer profile (sonic-net#421) [Kamil Cudnik]
* c0b39ea 2019-02-12 | Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABLE_TABLE (sonic-net#418) [Jipan Yang]
* ab35dfa 2019-02-11 | Add support for vlan tagged frames in virtual switch (sonic-net#417) [Kamil Cudnik]
* 145ea44 2019-02-02 | [flex counter] handle router interface stats (sonic-net#410) [Mykola F]
* c03d639 2019-02-02 | Add more information on failed map sizes (sonic-net#416) [Kamil Cudnik]
* 29f1e3c 2019-01-31 | Update SAI pointer (sonic-net#414) [Marian Pritsak]
* c0a948d 2019-01-30 | Add WRED specific comparison logic (sonic-net#413) [Kamil Cudnik]
* 1b6a661 2019-01-24 | install SAI extension header files into /usr/include/sai (sonic-net#412) [lguohan]
* 849525a 2019-01-24 | Initialize notification queue pointer before switch create (sonic-net#411) [Kamil Cudnik]
* 02d92f1 2019-01-23 | Add log info for not matching SG/IPG/QUEUES (sonic-net#409) [Kamil Cudnik]
* 8793562 2019-01-18 | Update SAI pointer to latest master (sonic-net#408) [Marian Pritsak]

swss-common

* ec04a5a 2019-02-14 | Add support for WarmStart::setDataCheckState() (sonic-net#242) [Jipan Yang]
* 56bd73f 2019-02-13 | Force only supported commands on consumer table (sonic-net#261) [Kamil Cudnik]
* 414de0f 2019-02-12 | Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABLE_TABLE (sonic-net#260) [Jipan Yang]
* 88de725 2019-02-05 | [pyext] enable types in stdint.h (sonic-net#259) [Ying Xie]
* f457ae8 2019-02-05 | Optimized ProducerStateTable set/del notification processing to avoid… (sonic-net#257) [Jipan Yang]
* e5286fd 2019-01-30 | [rif counters] Rif counter schema update (sonic-net#256) [Mykola F]

sonic-utilities

* b44b462 2019-02-14 | Move warm_restart enable/disable config to stateDB WARM_RESTART_ENABL… (sonic-net#458) (HEAD, origin/master, origin/HEAD) [Jipan Yang]
* e856b8b 2019-02-11 | [aclshow] output only counters per table/rule (sonic-net#442) [Roman Kachur]

Signed-off-by: Guohan Lu <gulv@microsoft.com>
Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>
@lguohan lguohan merged commit 0846654 into sonic-net:master Feb 16, 2019
yxieca added a commit to yxieca/sonic-buildimage that referenced this pull request Nov 10, 2022
utilities:
* 8cb6124 2022-11-09 | [armhf][sonic-installer] Fix the issue of sonic-installer list after set-default and cleanup (sonic-net#2479) [Marty Y. Lok]
* b2d50f4 2022-11-06 | [GCU] Fix JsonPointerFilter bug (sonic-net#2477) (HEAD -> 202205, github/202205) [jingwenxie]
* 927daea 2022-11-08 | Do not configure physical attributes on port channels in portconfig (sonic-net#2456) [Stephen Sun]
* dbe8f2d 2022-11-02 | Fix sudo sfputil show error-status on a multiasic platform issue (sonic-net#2373) [Marty Y. Lok]
* fff5f67 2022-11-04 | [show] vnet advertised-route command (sonic-net#2390) (sonic-net#2478) [siqbal1986]
* 9d921a7 2022-11-04 | Fix exception in adding mirror_session when gre_type is absent (sonic-net#2476) [bingwang-ms]
* 0bbe54a 2022-11-03 | [show] vnet endpoint [ip/ipv6] command (sonic-net#2342) (sonic-net#2421) (sonic-net#2474) [siqbal1986]
* b1b3661 2022-11-03 | show vnet routes all. (sonic-net#2341) (sonic-net#2472) [siqbal1986]

swss:
* e208c87 2022-11-08 | swss: Fixing race condition for rif counters (sonic-net#2488) (HEAD -> 202205) [Suman Kumar]

platform-common:
* 83f77cc 2022-11-08 | Fix issue: rounding float value for txpower and rxpower (sonic-net#320) (HEAD -> 202205) [Junchao-Mellanox]
* 169ee25 2022-11-04 | Fix issue: copper cable should not display DOM information (sonic-net#318) [Junchao-Mellanox]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
prsunny pushed a commit that referenced this pull request Nov 11, 2022
swss update with following commits:
81f4ea9 orchagent/portsorch: Missing scheduler group after SWSS restart (#2174)
e557855 [SWSS] Innovium platform specific changes in PFC Detect lua script (#2493)
6e288dc New P4Orch development. (#2425)
ab0e474 swss: Fixing race condition for rif counters (#2488)
724f914 [tests] [asan] extend graceful stop flag to also stop syncd (#2491)
84642f3 [Dynamic buffer calculation][Mellanox] Enhance the logic to identify buffer pools and profiles (#2498)
e04bb43 Fix vs test issue: failed to remove vlan due to referenced by vlan interface (#2504)
52c561f Added LAG member check on addLagMember() (#2464)
yxieca added a commit that referenced this pull request Nov 12, 2022
…2669)

utilities:
* 8cb6124 2022-11-09 | [armhf][sonic-installer] Fix the issue of sonic-installer list after set-default and cleanup (#2479) [Marty Y. Lok]
* b2d50f4 2022-11-06 | [GCU] Fix JsonPointerFilter bug (#2477) (HEAD -> 202205, github/202205) [jingwenxie]
* 927daea 2022-11-08 | Do not configure physical attributes on port channels in portconfig (#2456) [Stephen Sun]
* dbe8f2d 2022-11-02 | Fix sudo sfputil show error-status on a multiasic platform issue (#2373) [Marty Y. Lok]
* fff5f67 2022-11-04 | [show] vnet advertised-route command (#2390) (#2478) [siqbal1986]
* 9d921a7 2022-11-04 | Fix exception in adding mirror_session when gre_type is absent (#2476) [bingwang-ms]
* 0bbe54a 2022-11-03 | [show] vnet endpoint [ip/ipv6] command (#2342) (#2421) (#2474) [siqbal1986]
* b1b3661 2022-11-03 | show vnet routes all. (#2341) (#2472) [siqbal1986]

swss:
* e208c87 2022-11-08 | swss: Fixing race condition for rif counters (#2488) (HEAD -> 202205) [Suman Kumar]

platform-common:
* 83f77cc 2022-11-08 | Fix issue: rounding float value for txpower and rxpower (#320) (HEAD -> 202205) [Junchao-Mellanox]
* 169ee25 2022-11-04 | Fix issue: copper cable should not display DOM information (#318) [Junchao-Mellanox]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
tshalvi pushed a commit to tshalvi/sonic-buildimage that referenced this pull request Dec 20, 2022
The cleanup code for stale rif counters are now moved to syncd . Earlier as part of fix for issue sonic-net#2193 the cleanup for stale rif counters was added.
But it could create a race condition between orchagent removes RIF rate counters from DB and lua script fetching them.
So as a fix all such cleanup has been moved to syncd.

- What I did
Fix for sonic-net#11621

As a past fix which aimed at removing stale rif counters (sonic-net#2199) , there is a chance of race condition and it leads to lua script reporting error.
To handle this , the rif counters cleanup code(handled in cleanUpRifFromCounterDb) is now called from syncd ( removeCounter ) to avoid such race condition.

- Why I did it

The operations in Orchagent and syncd is not synchronous, so while Orchagent deletes the rif counters from Counters Db, the syncd could still access it. In race conditions the lua script trying to fetch rif counters will have errors syslog for such access as it was already deleted by orchagent. The cleanup code is removed from orchagent is added in syncd - it will make sure no such race condition would get hit.

- How I verified it

Followed the steps in (sonic-net#11621) :

Create RIF in SONiC, wait till RIF rates are populated in COUNTERS DB
Remove RIF
Repeat the steps multiple times and check if any error syslog is seen (No error syslog is seen)
Also checked cleanup for rif counters.

After RIF creation derived info of oid for RIF from "COUNTERS_RIF_NAME_MAP"
127) "Vlan100"
128) "oid:0x6000000000aa5"

Checked all the tabled in COUNTER_DB which has same OID in keys
127.0.0.1:6379[2]> keys 6000000000aa5
1) "RATES:oid:0x6000000000aa5:RIF"
2) "COUNTERS:oid:0x6000000000aa5"
3) "RATES:oid:0x6000000000aa5"
127.0.0.1:6379[2]>

Deleted the RIF by removing the ip on the intf.

Checked COUNTER_DB again with same OID if there are stale entries or not. No stale entries exist now.
127.0.0.1:6379[2]> keys 6000000000aa5
(empty array)
127.0.0.1:6379[2]>

Signed-off-by: Suman Kumar <suman.kumar@broadcom.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants