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.

Sign up for GitHub

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

Jump to bottom

[submodule][master] Update submodule sonic-sairedis to the latest HEAD automatically #21614

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[submodule][master] Update submodule sonic-sairedis to the latest HEAD automatically #21614

wants to merge 1 commit into from
+1 −1

Conversation

mssonicbld
Copy link
Collaborator

@mssonicbld mssonicbld commented Feb 4, 2025 •
edited
Loading

Why I did it

src/sonic-sairedis

* 8fe55967 - (HEAD -> master, origin/master, origin/HEAD) Optimize counter polling interval by making it more accurate (#1457) (31 hours ago) [Stephen Sun]
* 0657fb3d - [azp] Download and install sonic-platform-vpp artifacts (#1521) (3 days ago) [Kamil Cudnik]
* b664f081 - [syncd] Move logSet logGet under mutex to prevent race condition (#1505) (3 days ago) [Kamil Cudnik]
* e11a959a - [FC] Support Policer Counter (#1484) (4 days ago) [Shira]
* 0f3b34eb - [nvidia] Skip SAI discovery on ports (#1416) (4 days ago) [Stepan Blyshchak]
* e72e49aa - Define bulk chunk size and bulk chunk size per counter ID. (#1519) (4 days ago) [Stephen Sun]
* be0c83da - sonic-sairedis : Wred stats feature changes on Sai-redis and Syncd (#1234) (5 days ago) [Rajesh Perumal R]
* 3c1ede96 - Use sonictest pool instead of sonic-common and fix arm64 issue. (#1511) (5 days ago) [Liu Shilong]

How I did it

How to verify it

Description for the changelog

@mssonicbld mssonicbld requested a review from lguohan as a code owner February 4, 2025 03:05
@mssonicbld
Copy link
Collaborator Author

/azp run Azure.sonic-buildimage

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld mssonicbld force-pushed the submodule-master-sonic-sairedis branch from 07f9def to 3b51de9 Compare February 5, 2025 03:05
@mssonicbld
Copy link
Collaborator Author

/azp run Azure.sonic-buildimage

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld mssonicbld force-pushed the submodule-master-sonic-sairedis branch from 3b51de9 to 415ba7d Compare February 6, 2025 03:06
@mssonicbld
Copy link
Collaborator Author

/azp run Azure.sonic-buildimage

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld mssonicbld force-pushed the submodule-master-sonic-sairedis branch from 415ba7d to 0a25142 Compare February 7, 2025 00:21
@mssonicbld
Copy link
Collaborator Author

/azp run Azure.sonic-buildimage

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld mssonicbld force-pushed the submodule-master-sonic-sairedis branch from 0a25142 to fb2a55f Compare February 7, 2025 03:03
@mssonicbld
Copy link
Collaborator Author

/azp run Azure.sonic-buildimage

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@stephenxs
Copy link
Collaborator

Hi @rpmarvell @kcudnik
It looks like the compiling error was introduced in WRED/ECN PR
Could you help to check it?

2025-02-07T06:53:24.3046049Z In file included from TestServerSai.cpp:13:
2025-02-07T06:53:24.3046202Z MockSaiInterface.h:22:31: error: 'queryStatsCapability' is not a type
2025-02-07T06:53:24.3046349Z      MOCK_METHOD(sai_status_t, queryStatsCapability,
2025-02-07T06:53:24.3046504Z                                ^~~~~~~~~~~~~~~~~~~~
2025-02-07T06:53:24.3046638Z MockSaiInterface.h:23:9: error: expected identifier before '(' token
2025-02-07T06:53:24.3046808Z          (sai_object_id_t switchOid, sai_object_type_t objectType, sai_stat_capability_list_t* statCapList),
2025-02-07T06:53:24.3046935Z          ^
2025-02-07T06:53:24.3047058Z MockSaiInterface.h:24:9: error: expected identifier before '(' token
2025-02-07T06:53:24.3047186Z          (override));
2025-02-07T06:53:24.3047279Z          ^
2025-02-07T06:53:24.3047424Z MockSaiInterface.h:24:19: error: ISO C++ forbids declaration of 'MOCK_METHOD' with no type [-fpermissive]
2025-02-07T06:53:24.3047570Z          (override));
2025-02-07T06:53:24.3047657Z                    ^
2025-02-07T06:53:24.3047773Z In file included from MockSaiInterface.cpp:1:
2025-02-07T06:53:24.3047925Z MockSaiInterface.h:22:31: error: 'queryStatsCapability' is not a type
2025-02-07T06:53:24.3048070Z      MOCK_METHOD(sai_status_t, queryStatsCapability,
2025-02-07T06:53:24.3048196Z                                ^~~~~~~~~~~~~~~~~~~~
2025-02-07T06:53:24.3048330Z MockSaiInterface.h:23:9: error: expected identifier before '(' token
2025-02-07T06:53:24.3048490Z          (sai_object_id_t switchOid, sai_object_type_t objectType, sai_stat_capability_list_t* statCapList),
2025-02-07T06:53:24.3048620Z          ^
2025-02-07T06:53:24.3048742Z MockSaiInterface.h:24:9: error: expected identifier before '(' token
2025-02-07T06:53:24.3048870Z          (override));
2025-02-07T06:53:24.3048966Z          ^
2025-02-07T06:53:24.3049135Z MockSaiInterface.h:24:19: error: ISO C++ forbids declaration of 'MOCK_METHOD' with no type [-fpermissive]
2025-02-07T06:53:24.3049270Z          (override));
2025-02-07T06:53:24.3049365Z                    ^
2025-02-07T06:53:24.3049482Z make[5]: *** [Makefile:890: tests-TestServerSai.o] Error 1
2025-02-07T06:53:24.3049615Z make[5]: *** Waiting for unfinished jobs....
2025-02-07T06:53:24.3049750Z make[5]: *** [Makefile:918: tests-MockSaiInterface.o] Error 1
2025-02-07T06:53:24.3049897Z make[5]: Leaving directory '/sonic/src/sonic-sairedis/unittest/lib'
2025-02-07T06:53:24.3050028Z make[4]: *** [Makefile:404: all-recursive] Error 1
2025-02-07T06:53:24.3050168Z make[4]: Leaving directory '/sonic/src/sonic-sairedis/unittest'
2025-02-07T06:53:24.3050307Z make[3]: *** [Makefile:457: all-recursive] Error 1
2025-02-07T06:53:24.3050443Z make[3]: Leaving directory '/sonic/src/sonic-sairedis'
2025-02-07T06:53:24.3050573Z make[2]: *** [Makefile:389: all] Error 2
2025-02-07T06:53:24.3050701Z make[2]: Leaving directory '/sonic/src/sonic-sairedis'
2025-02-07T06:53:24.3050828Z dh_auto_build: error: make -j4 returned exit code 2
2025-02-07T06:53:24.3050958Z make[1]: *** [debian/rules:49: build] Error 25
2025-02-07T06:53:24.3051088Z make[1]: Leaving directory '/sonic/src/sonic-sairedis'

rpmarvell pushed a commit to rpmarvell/sonic-sairedis that referenced this pull request Feb 7, 2025
@pavannaregundi
Fixing the sairedis build issue caused at sonic-net/sonic-buildimage#…
70f728c 
…21614 , Removing the undefine MOCK functions to fix the issue.

Signed-off-by: Rajesh Perumal <rperumal@marvell.com>
rpmarvell added a commit to rpmarvell/sonic-sairedis that referenced this pull request Feb 7, 2025
@rpmarvell @pavannaregundi
Fixing the sairedis build issue caused at sonic-net/sonic-buildimage#…
4f18dee 
…21614 , Removing the undefine MOCK functions to fix the issue.

Signed-off-by: Rajesh Perumal <rperumal@marvell.com>
@rpmarvell rpmarvell mentioned this pull request Feb 7, 2025
Open
rpmarvell added a commit to rpmarvell/sonic-sairedis that referenced this pull request Feb 7, 2025
@rpmarvell @pavannaregundi
Fixing the sairedis build issue caused at sonic-net/sonic-buildimage#…
8a5e802 
…21614 , Removing the undefine MOCK functions to fix the issue.

Signed-off-by: Rajesh Perumal <rperumal@marvell.com>
@kcudnik
Copy link
Contributor

kcudnik commented Feb 7, 2025

@stephenxs @rpmarvell on sairedis repo it was working fine, is it because SAI is on different header on sonic buildimage?

@rpmarvell
Copy link
Contributor

rpmarvell commented Feb 7, 2025 •
edited
Loading

@kcudnik : If this issue needs to be fixed quickly, i can remove the testcase temporarily. Please suggest if it is required.

@kcudnik
Copy link
Contributor

kcudnik commented Feb 7, 2025

this is not my change, please ask author

@mssonicbld mssonicbld force-pushed the submodule-master-sonic-sairedis branch from fb2a55f to 263eb76 Compare February 8, 2025 03:05
@mssonicbld
Copy link
Collaborator Author

/azp run Azure.sonic-buildimage

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld mssonicbld force-pushed the submodule-master-sonic-sairedis branch from 263eb76 to 09db556 Compare February 9, 2025 03:05
@mssonicbld
Copy link
Collaborator Author

/azp run Azure.sonic-buildimage

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lguohan lguohan Awaiting requested review from lguohan lguohan is a code owner

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
automerge Submodule Update ⏫
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mssonicbld @stephenxs @kcudnik @rpmarvell