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

fix: openssl is compiled twice, once not vendored in linux #13001

Merged
merged 1 commit into from
Oct 23, 2023

Conversation

xxchan
Copy link
Member

@xxchan xxchan commented Oct 23, 2023

It’s broken since the workspace-hack change (#12961).

Openssl-sys is compiled twice on Linux, because features are not unified.

The one for build-dependency doesn’t have openssl-sys feature. It’s depended by tls-native, which is depended by sql-x, which is build-dependency in workspace-hack. (Since we didn't configure hakari to unify target os-specific dependencies, hakari unified it only partialy, and this cause them unnecessarily compiled twice.)

Simply put, it’s now a build-dependency so

This only happens on linux, but not mac, because native-tls works differently for different os.

Temporary workaround this by manually unify feature in workspace-config to unblock daily pipeline and stuff. Later, we might delete [build-dependencies] for docker/release. Or completely get rid of workspace-hack.

TLDR: After this change, on Linux openssl is compiled once in debug mode, and still twice in release mode. Both once on mac.

I hereby agree to the terms of the RisingWave Labs, Inc. Contributor License Agreement.

What's changed and what's your intention?

Checklist

  • I have written necessary rustdoc comments
  • I have added necessary unit tests and integration tests
  • I have added fuzzing tests or opened an issue to track them. (Optional, recommended for new SQL features Sqlsmith: Sql feature generation #7934).
  • My PR contains breaking changes. (If it deprecates some features, please create a tracking issue to remove them in the future).
  • All checks passed in ./risedev check (or alias, ./risedev c)
  • My PR changes performance-critical code. (Please run macro/micro-benchmarks and show the results.)
  • My PR contains critical fixes that are necessary to be merged into the latest release. (Please check out the details)

Documentation

  • My PR needs documentation updates. (Please use the Release note section below to summarize the impact on users)

Release note

If this PR includes changes that directly affect users or other significant modifications relevant to the community, kindly draft a release note to provide a concise summary of these changes. Please prioritize highlighting the impact these changes will have on users.

It’s broken since the workspace-hack change (#12961).

Openssl-sys is compiled twice on Linux, because features are not unified.

The one for build-dependency doesn’t have openssl-sys feature. It’s depended by tls-native, which is depended by sql-x, which is build-dependency in workspace-hack. (Since we didn't configure hakari to unify target os-specific dependencies, hakari unified it only *partialy*, and this cause them unnecessarily compiled twice.)

Simply put, it’s now a build-dependency so
- Feature is not unified. This can be fixed easily and is done in this PR.
- It will be compiled twice in release mode. Unless #12362, but it’s broken. Not a large problem(? Well, I’m not sure But it has been so). Just slower…

This only happens on linux, but not mac, because native-tls works differently for different os.

Temporary workaround this by manually unify feature in workspace-config to unblock daily pipeline and stuff. Later, we might delete [build-dependencies] for docker/release. Or completely get rid of workspace-hack.

TLDR: After this change, on Linux openssl is compiled once in debug mode, and still twice in release mode. Both once on mac.
@github-actions github-actions bot added the type/fix Bug fix label Oct 23, 2023
@xxchan xxchan requested a review from BugenZhao October 23, 2023 08:05
@codecov
Copy link

codecov bot commented Oct 23, 2023

Codecov Report

Merging #13001 (18adafb) into main (abafae0) will increase coverage by 0.00%.
Report is 2 commits behind head on main.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main   #13001   +/-   ##
=======================================
  Coverage   68.75%   68.76%           
=======================================
  Files        1496     1496           
  Lines      250409   250409           
=======================================
+ Hits       172179   172198   +19     
+ Misses      78230    78211   -19     
Flag Coverage Δ
rust 68.76% <ø> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

see 6 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@xxchan xxchan requested a review from TennyZhuang October 23, 2023 08:43
@xxchan
Copy link
Member Author

xxchan commented Oct 23, 2023

docker build passed

@xxchan xxchan enabled auto-merge October 23, 2023 08:43
@xxchan xxchan added this pull request to the merge queue Oct 23, 2023
Merged via the queue into main with commit a3d2c4b Oct 23, 2023
9 of 10 checks passed
@xxchan xxchan deleted the xxchan/thankyouhakariandopenssl branch October 23, 2023 09:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type/fix Bug fix
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants