Add thrift 0.13.0 #8307

msosyak · 2021-08-02T13:52:24Z

Why I did it

To bump thrift version to 0.13.0, to fix some dependencies issues.

How I did it

As there are dependencies between thrift and saithrinft server (https://github.com/opencomputeproject/SAI/tree/bf3630316cbef484e1015478b5746067bac4e2b8/test/saithrift) which is used by syncd-rpc to update thrift version, I also need to make changes in saithrinft server, and then SAI ref point should be updated in sairedis, and then sairedis ref point should be updated too. It is too many change, so I decided to add thrift 0.13.0 as separeate target to be able to work and test father changes in saithrinft and one when appropriate changes will be merged to SAI and ref points will be updated I will squash this and the old thrift target. I was not able to build thrift deb pkg by original rules, so I copied debian folder from the old version and tune it for newer one.

How to verify it

make init
make configure PLATFORM=vs
make target/debs/buster/libthrift_0.13.0_amd64.deb

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

Description for the changelog

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

 /\__/\
(=^.^=)
 (")(")_/

msosyak · 2021-08-09T07:42:13Z

@qiluo-msft @xumia Please review

qiluo-msft · 2021-08-09T08:56:54Z

Do you get the files from upstream? If mostly yes, do not copy them, instead, download it from a upstream repo, and apply your patch, and then build.

ref: https://github.com/Azure/sonic-buildimage/tree/master/src/initramfs-tools

In reply to: 895057166

msosyak · 2021-08-09T11:25:33Z

I was not able to build thrift deb pkg by original rules https://github.com/apache/thrift/tree/0.13.0/debian , so I copied debian folder from the old version https://github.com/Azure/sonic-buildimage/blob/91432fff65347464d5e67cb80a39493acb91e570/src/thrift/Makefile#L19 and tune it for a newer one. I have tried to add patches to not copy but download and patch. But there are many changes including files renaming and deleting, so the copy of all debian folders looks more clear.

I have also tried to search for the newer version of thrift packages on https://sonicstorage.blob.core.windows.net/packages/debian, but looks like I do not have permission to browse the storage or do not found the proper link to do it. Will be very appreciate if you share the info on how to browse https://sonicstorage.blob.core.windows.net/packages/debian and push/update files there if it is possible.

qiluo-msft · 2021-08-10T06:54:59Z

Did you try https://packages.debian.org/bullseye/libthrift-0.13.0?
Download Source Package thrift:
[thrift_0.13.0-6.dsc]
[thrift_0.13.0.orig.tar.gz]
[thrift_0.13.0-6.debian.tar.xz]

In reply to: 895776613

msosyak · 2021-08-10T10:52:22Z

No, I haven't tried. I missed that there is an archive with the source code. Just tried and it works. Thank you for the tip. I have updated PR to use source archive from debian.org

src/thrift_0_13_0/.gitignore

src/thrift_0_13_0/Makefile

rules/thrift_0_13_0.dep

src/thrift_0_13_0/Makefile

src/thrift_0_13_0/patch/0001-Disable-unneeded-packages.patch

* use wget -O instead of wildcard remove * remove lines instead of comment in patch

msosyak · 2021-08-18T06:42:25Z

@qiluo-msft Your approval was dismissed when I force pushed the latest commit to retrigger the CI as it was failed.
Not the CI passed, so could we merge this?

msosyak · 2021-08-31T09:38:43Z

@qiluo-msft Do you have some concerns or could we merge this?

#### Why I did it To bump thrift version to 0.13.0, to fix some dependencies issues. #### How I did it As there are dependencies between thrift and saithrinft server (https://github.com/opencomputeproject/SAI/tree/bf3630316cbef484e1015478b5746067bac4e2b8/test/saithrift) which is used by syncd-rpc to update thrift version, I also need to make changes in saithrinft server, and then SAI ref point should be updated in sairedis, and then sairedis ref point should be updated too. It is too many change, so I decided to add thrift 0.13.0 as separeate target to be able to work and test father changes in saithrinft and one when appropriate changes will be merged to SAI and ref points will be updated I will squash this and the old thrift target. I was not able to build thrift deb pkg by original rules, so I copied `debian `folder from the old version and tune it for newer one. #### How to verify it ``` make init make configure PLATFORM=vs make target/debs/buster/libthrift_0.13.0_amd64.deb ``` ```

* Add thrift 0.13.0 (#8307) #### Why I did it To bump thrift version to 0.13.0, to fix some dependencies issues. #### How I did it As there are dependencies between thrift and saithrinft server (https://github.com/opencomputeproject/SAI/tree/bf3630316cbef484e1015478b5746067bac4e2b8/test/saithrift) which is used by syncd-rpc to update thrift version, I also need to make changes in saithrinft server, and then SAI ref point should be updated in sairedis, and then sairedis ref point should be updated too. It is too many change, so I decided to add thrift 0.13.0 as separeate target to be able to work and test father changes in saithrinft and one when appropriate changes will be merged to SAI and ref points will be updated I will squash this and the old thrift target. I was not able to build thrift deb pkg by original rules, so I copied `debian `folder from the old version and tune it for newer one. #### How to verify it ``` make init make configure PLATFORM=vs make target/debs/buster/libthrift_0.13.0_amd64.deb ``` ``` * Correct the pkg name for thrift.0.13.0 Correct thrift.0.13.0 dependent package name. In previous code, the buildout target was named as PYTHON3_THRIFT_0_13_0 But when add the prackage to LIBTHRIFT_0_13_0, it typo as PYTHON_THRIFT_0_13_0 Co-authored-by: Myron Sosyak <[email protected]>

Add thrift 0.13.0 as separate target

facf833

msosyak requested review from lguohan, qiluo-msft and xumia as code owners August 2, 2021 13:52

msosyak force-pushed the myron/thrift_13 branch 2 times, most recently from 0e2450d to 0e74ee1 Compare August 10, 2021 10:41

Your Name added 3 commits August 10, 2021 10:45

Use thrift source archive from packages.debian.org

0e74ee1

Update gitignore

17459a4

Add new line at the file end

75535f2