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

win32_deps_build.sh: bump snappy version to 1.1.9 #42516

Merged
merged 3 commits into from Jul 29, 2021

Conversation

tchaikov
Copy link
Contributor

@tchaikov tchaikov commented Jul 28, 2021

@tchaikov tchaikov added the win32 Specifix changes for the windows platform label Jul 28, 2021
@tchaikov tchaikov requested a review from smithfarm July 28, 2021 09:16
@tchaikov
Copy link
Contributor Author

cc @petrutlucian94

@tchaikov
Copy link
Contributor Author

changelog

  • pass -DSNAPPY_BUILD_BENCHMARKS=OFF to cmake while building snappy.

smithfarm and others added 3 commits July 29, 2021 12:13
The snappy project made the following change in snappy.h between version 1.1.8
and 1.1.9:

<   bool GetUncompressedLength(Source* source, uint32_t* result);
---
>   bool GetUncompressedLength(Source* source, uint32* result);

This causes Ceph to FTBFS with snappy 1.1.9.

Thanks to Chris Denice for bringing this to our attention via Redmine.

Fixes: https://tracker.ceph.com/issues/50934
Signed-off-by: Nathan Cutler <ncutler@suse.com>
in snappy, the commit of 26102a0c66175bc39edbf484c994a21902e986dc
fixes the SNAPPY_VERSION generation. and this commit was included by
v1.1.8 and v1.1.9.

also, in v1.1.9, a change was introduced, where the function signature
was changed, and more importantly, this change is not backward
compatible:

<   bool GetUncompressedLength(Source* source, uint32_t* result);
---
>   bool GetUncompressedLength(Source* source, uint32* result);

see also, https://tracker.ceph.com/issues/50934

so we check SNAPPY_VERSION to tell if we should use `uint32_t` or
`uint32`.

in this change, snappy version used to build win32 client is bumped
to the latest stable version, v1.1.9, to include the fix of
SNAPPY_VERSION. this paves the road to fix of https://tracker.ceph.com/issues/50934

Signed-off-by: Kefu Chai <kchai@redhat.com>
no need to clone the whole repo, just clone the tip of the specified
tag. this saves the bandwidth, disk IO and precious time.

Signed-off-by: Kefu Chai <kchai@redhat.com>
@tchaikov
Copy link
Contributor Author

changelog

@tchaikov
Copy link
Contributor Author

tchaikov commented Jul 29, 2021

@smithfarm
Copy link
Contributor

smithfarm commented Jul 29, 2021

@tchaikov Please update https://tracker.ceph.com/issues/50934 when this gets merged, so I can prepare the pacific backport.

@tchaikov
Copy link
Contributor Author

@smithfarm sure, will do.

@tchaikov tchaikov merged commit e8da264 into ceph:master Jul 29, 2021
@tchaikov tchaikov deleted the wip-win32-snappy branch July 29, 2021 09:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build/ops win32 Specifix changes for the windows platform wip-kefu-testing
Projects
None yet
2 participants