Skip to content

Fixing the sairedis build issue caused at https://github.com/sonic-ne…#1526

Merged
kcudnik merged 1 commit intosonic-net:masterfrom
rpmarvell:rpmarvell_sairedis_stats_capability_build_fix
Feb 14, 2025
Merged

Fixing the sairedis build issue caused at https://github.com/sonic-ne…#1526
kcudnik merged 1 commit intosonic-net:masterfrom
rpmarvell:rpmarvell_sairedis_stats_capability_build_fix

Conversation

@rpmarvell
Copy link
Contributor

Why did i do this change ?
To fix the Build break mentioned at sonic-net/sonic-buildimage#21614

@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@rpmarvell rpmarvell force-pushed the rpmarvell_sairedis_stats_capability_build_fix branch from 4f18dee to 8a5e802 Compare February 7, 2025 11:07
@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@rpmarvell rpmarvell force-pushed the rpmarvell_sairedis_stats_capability_build_fix branch from 8a5e802 to 5785852 Compare February 10, 2025 09:32
@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@kcudnik
Copy link
Collaborator

kcudnik commented Feb 10, 2025

why not revert previous change ?

kperumalbfn
kperumalbfn previously approved these changes Feb 10, 2025
@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@rpmarvell rpmarvell force-pushed the rpmarvell_sairedis_stats_capability_build_fix branch from 6a5c285 to 2e17f96 Compare February 11, 2025 19:38
@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@rpmarvell rpmarvell force-pushed the rpmarvell_sairedis_stats_capability_build_fix branch from 2e17f96 to 52fa1f5 Compare February 11, 2025 19:38
@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@rpmarvell
Copy link
Contributor Author

I have removed the MOCK test which caused the error.

@kcudnik
Copy link
Collaborator

kcudnik commented Feb 11, 2025

you als ohave this:

In file included from AttrKeyMap.cpp:3:
sai_serialize.h:76:20: error: 'sai_prefix_compression_entry_t' does not name a type
   76 |         _In_ const sai_prefix_compression_entry_t &prefix_compression_entry);
      |                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
sai_serialize.h:459:15: error: 'sai_prefix_compression_entry_t' has not been declared
  459 |         _Out_ sai_prefix_compression_entry_t& prefix_compression_entry);
      |               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
make[4]: *** [Makefile:729: libsaimeta_la-AttrKeyMap.lo] Error 1
make[4]: *** Waiting for unfinished jobs....
In file included from Globals.cpp:3:
sai_serialize.h:76:20: error: 'sai_prefix_compression_entry_t' does not name a type
   76 |         _In_ const sai_prefix_compression_entry_t &prefix_compression_entry);
      |                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
sai_serialize.h:459:15: error: 'sai_prefix_compression_entry_t' has not been declared
  459 |         _Out_ sai_prefix_compression_entry_t& prefix_compression_entry);
      |               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

since you are downgrading SAI from master to 15.4 that prefix entry don't exists, and it will pull cascade removal of apis in source code because of non existient definitions and types

@rpmarvell rpmarvell force-pushed the rpmarvell_sairedis_stats_capability_build_fix branch from 52fa1f5 to 310f51f Compare February 11, 2025 20:15
@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@rpmarvell
Copy link
Contributor Author

@kcudnik : I have removed the issue causing Mock method and restarted the build at sonic-net/sonic-buildimage#21685 . Once it is completed successfully , we should be able to go ahead with the merge for this PR.

@kcudnik
Copy link
Collaborator

kcudnik commented Feb 12, 2025

you removed just unittests here, how come this was passing on sairedis repo and not on buildimage ?

@rpmarvell
Copy link
Contributor Author

I have removed the test which caused the failure. it fixed the build "Azure.sonic-buildimage (BuildVS vs)". But there are other failures at sonic-buildimage repo, which i am not able to link with my changes.

@rpmarvell rpmarvell force-pushed the rpmarvell_sairedis_stats_capability_build_fix branch from 310f51f to 86bfba7 Compare February 13, 2025 10:02
@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@rpmarvell rpmarvell force-pushed the rpmarvell_sairedis_stats_capability_build_fix branch from 86bfba7 to b527e08 Compare February 13, 2025 10:28
@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@kperumalbfn
Copy link

@kcudnik Could you pls merge this?

@kcudnik kcudnik merged commit 7479aa2 into sonic-net:master Feb 14, 2025
15 checks passed
@r12f
Copy link
Contributor

r12f commented Feb 21, 2025

hi @rpmarvell , do you mind helping us create the manual cherry pick change to 202412: https://github.com/Azure/sonic-sairedis.msft.

@r12f
Copy link
Contributor

r12f commented Feb 28, 2025

This PR is dependent on #1234

@kperumalbfn
Copy link

hi @rpmarvell , do you mind helping us create the manual cherry pick change to 202412: https://github.com/Azure/sonic-sairedis.msft.

@rpmarvell Could you please create a PR to 202412 branch. Looks like we have cherry pick conflict that is blocking to do auto merge this.

@mssonicbld
Copy link
Collaborator

Cherry-pick PR to msft-202412: Azure/sonic-sairedis.msft#33

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.

5 participants