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

[cherry-pick]Align 202211 with master for 202211 release (#1129)(#1116)(#1141) (#1136) (#1140) #1151

Merged
merged 5 commits into from
Nov 16, 2022

Conversation

richardyu-ms
Copy link
Contributor

@richardyu-ms richardyu-ms commented Nov 15, 2022

Align 202211 with master for 202211 release

[gbsyncd] Add asic db prefix for channel NOTIFICATIONS (#1129) commit:b7c85ca
Make changes to building and packaging sairedis (#1116) commit:7b39fc4
Revert "Make changes to building and packaging sairedis (#1116)" (#1141) commit:461678f
sairedis: Fixing race condition for rif counters (#1136) commit:2f2698c
[SAI submodule update] Enable support for SAI v1.11.0 (#1140) commit:7413c70

jimmyzhai and others added 5 commits November 15, 2022 23:23
Fix sonic-net#1131. The communication channel between orchagent and gbsyncd needs different from
the channel "NOTIFICATIONS" between orchagent and syncd.
* Make changes to building and packaging sairedis

This commit includes the following changes:
1. Use Debian build profiles instead of custom build targets to build
different configurations of sairedis. Build profiles were designed for
this purpose. This also makes the debian/rules file a bit cleaner.
2. Rely on the debug packages being automatically created, instead of us
explicitly specifying it in debian/control.
3. Add actual support for excluding Python 2 binding build.
4. Make sure the compile flags used for building Python 2 and Python 3
are actually correct.

Signed-off-by: Saikrishna Arcot <[email protected]>

* Update pipeline file

Signed-off-by: Saikrishna Arcot <[email protected]>

* Fix argument for profile

Signed-off-by: Saikrishna Arcot <[email protected]>

* Exclude libsai package from the list of dependencies

Signed-off-by: Saikrishna Arcot <[email protected]>

* Allow multiple syslog artifacts during tests

Signed-off-by: Saikrishna Arcot <[email protected]>
…)" (sonic-net#1141)

This may be causing or exposing some issues during tests.

This reverts commit 7b39fc4.
* Fixing issue #11621
* The cleanup code for stale rif counters are now moved to syncd . Earlier as part of fix for issue #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.

Signed-off-by: Suman Kumar <[email protected]>
* [SAI submodule update] Enable support for SAI v1.11.0

Signed-off-by: richardyu-ms <[email protected]>

* update SAI for saithift fix

* upgrade to latest sai 1.11

add cases

fix a code issue

Signed-off-by: richardyu-ms <[email protected]>

* refactor code

Signed-off-by: richardyu-ms <[email protected]>

Signed-off-by: richardyu-ms <[email protected]>
@richardyu-ms richardyu-ms changed the title [cherry-pick]Align 202211 with master for 202211 release (#1129)(#1116)(#1141) (#1136) [cherry-pick]Align 202211 with master for 202211 release (#1129)(#1116)(#1141) (#1136) (#1140) Nov 16, 2022
@richardyu-ms richardyu-ms marked this pull request as ready for review November 16, 2022 03:09
@richardyu-ms richardyu-ms merged commit 95105fc into sonic-net:202211 Nov 16, 2022
@richardyu-ms richardyu-ms deleted the align-202211-master branch December 4, 2022 12:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants