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

Misc OpenSSL 3.x fixes #5650

Merged
merged 10 commits into from
Sep 14, 2023
Merged

Misc OpenSSL 3.x fixes #5650

merged 10 commits into from
Sep 14, 2023

Conversation

jumaffre
Copy link
Contributor

This fixes minor errors following the OpenSSL 3.x, mostly on release/4.x. Namely:

  • Re-enable TPCC perf test on main, and fix TPCC client.
  • Re-enable and fix leak in indexing_test on main.

@jumaffre jumaffre added auto-backport Automatically backport this PR to LTS branch 4.x-todo PRs which should be backported to 4.x labels Sep 12, 2023
@jumaffre jumaffre requested a review from a team as a code owner September 12, 2023 08:46
eddyashton
eddyashton reviewed Sep 12, 2023
View reviewed changes
CMakeLists.txt Outdated Show resolved Hide resolved
@jumaffre
Copy link
Contributor Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 3 pipeline(s).

@ccf-bot
Copy link
Collaborator

ccf-bot commented Sep 13, 2023 •
edited
Loading

misc_openssl3_fixes@75805 aka 20230914.5 vs main ewma over 20 builds from 75427 to 75799

Click to see table

main

build_id build_number pi_basic_mt_sgx_cft^ pi_basic_mt_sgx_cft_mem pi_basic_mt_virtual_cft^ Commit latency factor ls_virtual_cft^ pi_ls_virtual_cft^ pi_basic_virtual_cft^ pi_basic_js_virtual_cft^ ls_sgx_cft^ ls_sgx_cft_mem pi_ls_sgx_cft^ pi_ls_sgx_cft_mem ls_jwt_virtual_cft^ pi_basic_sgx_cft^ pi_basic_sgx_cft_mem pi_ls_jwt_virtual_cft^ ls_js_virtual_cft^ ls_full_js_virtual_cft^ ls_js_jwt_virtual_cft^ pi_basic_js_sgx_cft^ pi_basic_js_sgx_cft_mem ls_jwt_sgx_cft^ ls_jwt_sgx_cft_mem pi_ls_jwt_sgx_cft^ pi_ls_jwt_sgx_cft_mem ls_js_sgx_cft^ ls_js_sgx_cft_mem hist_sgx_cft^ ls_full_js_sgx_cft^ ls_full_js_sgx_cft_mem ls_js_jwt_sgx_cft^ ls_js_jwt_sgx_cft_mem RB put (/s)^ CHAMP put (/s)^ RB get (/s)^ CHAMP get (/s)^
75427 20230905.45 32303 2.51822e+07 72646.1 0.79923 43818.6 47219.3 54172.4 4474.6 16851.9 1.88908e+07 16843.5 1.05021e+07 17207 18380.2 1.46964e+07 20035.7 17125.1 16863.6 9757.72 1660.9 1.25993e+07 8204.56 1.88908e+07 8033.3 6.30784e+06 7055.71 1.67936e+07 49899.7 6604.32 1.67936e+07 4591.15 1.88908e+07 831718 1.18507e+06 8.16148e+06 3.07891e+07
75432 20230906.1 32134 2.72794e+07 72254 0.792911 44002.6 47749.6 54054.4 4440.1 16953.5 1.88908e+07 16886.8 1.05021e+07 17184.3 18426.2 1.46964e+07 19123.7 17476.7 14970.7 10416.6 1656.7 1.25993e+07 8197.08 1.88908e+07 8067.4 6.30784e+06 7062.48 1.67936e+07 47511.8 6650.18 1.67936e+07 4558.5 1.88908e+07 836786 1.17882e+06 8.13596e+06 3.09679e+07
75453 20230906.8 31842.2 2.51822e+07 62844.4 0.786039 45758.2 48251.8 54707.9 4474.7 16911.9 1.88908e+07 16854.2 1.05021e+07 17380.4 18339 1.46964e+07 18840.6 17589.3 14994.8 9887.4 1666.3 1.25993e+07 8195.46 1.88908e+07 8236.7 6.30784e+06 7050.11 1.67936e+07 47836.8 6651.5 1.67936e+07 4550.56 1.88908e+07 831787 1.17789e+06 8.12511e+06 3.08063e+07
75489 20230906.23 31743.9 2.51822e+07 82560 0.800124 43804.6 47435.6 54050.3 4459.5 16654.9 1.88908e+07 16776.6 1.05021e+07 17073.3 18256.7 1.25993e+07 18929 17464.5 14865.8 10073.8 1636.7 1.25993e+07 8153.42 1.88908e+07 8125.5 6.30784e+06 6677.29 1.67936e+07 49990.9 6628.14 1.67936e+07 4550.28 1.88908e+07 835269 1.17747e+06 8.13363e+06 3.07143e+07
75522 20230907.3 32075.6 2.51822e+07 66260.1 0.772057 45714.3 48111.2 54314.5 4463.3 16673.7 1.88908e+07 16929.9 1.05021e+07 17295.6 18283.4 1.46964e+07 19589.4 17065.4 14677.8 10062.2 1656.8 1.25993e+07 8168.97 1.88908e+07 8023.9 6.30784e+06 7052.03 1.67936e+07 49662.8 6594.49 1.67936e+07 4565.33 1.88908e+07 828056 1.18636e+06 8.1552e+06 3.07808e+07
75527 20230907.5 32308 2.51822e+07 86171.1 0.781303 43523 47340.4 53737.5 4404.9 16807.7 1.88908e+07 16890.6 1.05021e+07 17097.4 18259.9 1.46964e+07 19462.4 17630.6 15065 10283.8 1648.4 1.25993e+07 8151.7 1.88908e+07 7992.3 6.30784e+06 7014.17 1.67936e+07 42500.3 6599.19 1.67936e+07 4558.03 1.88908e+07 823830 1.18114e+06 8.1554e+06 3.07249e+07
75554 20230907.14 32296.2 2.51822e+07 89286.5 0.784733 45865.6 47959.1 54950.9 4492.7 16776.5 1.88908e+07 16911.3 1.05021e+07 17191.6 18490.9 1.46964e+07 19221.2 17286.2 16906.8 9966.44 1659.7 1.25993e+07 8214.84 1.88908e+07 8100.2 6.30784e+06 7060.74 1.67936e+07 47720.1 6600.24 1.67936e+07 4579.56 1.88908e+07 832953 1.17863e+06 8.1447e+06 3.05827e+07
75570 20230907.20 32177.9 2.51822e+07 62416.2 0.799646 45705.3 48300.1 55108.2 4494.8 16832.6 1.88908e+07 17001.3 1.05021e+07 17134.4 18451.6 1.46964e+07 19570.6 17098.8 16872.1 9890.69 1661.9 1.25993e+07 8246.8 1.88908e+07 8192.6 6.30784e+06 7051.77 1.67936e+07 46267.7 6608.3 1.67936e+07 4556.94 1.88908e+07 831516 1.18245e+06 8.13564e+06 3.11644e+07
75578 20230908.2 32091.1 2.51822e+07 78823.5 0.828259 43942.1 48082.5 54705.4 4443.4 16699.5 1.88908e+07 16847.4 1.05021e+07 17216 18400.6 1.46964e+07 18878.3 17041.1 16926.4 9811.7 1654.5 1.25993e+07 8136.67 1.88908e+07 8377.3 6.30784e+06 7061.63 1.67936e+07 48501.8 6591.31 1.67936e+07 4554.19 1.88908e+07 833497 1.1874e+06 8.15413e+06 3.08021e+07
75585 20230908.5 32334.7 2.51822e+07 74515.3 0.797482 43449.2 48049.2 54134.4 4445.7 16880.3 1.88908e+07 16912.1 1.05021e+07 16982.9 18498.4 1.25993e+07 19441.6 17178.3 14747.2 10169.7 1654.4 1.25993e+07 8214.32 1.88908e+07 8178.3 6.30784e+06 6689.4 1.67936e+07 48501 6602.85 1.67936e+07 4556.48 1.88908e+07 840060 1.18261e+06 8.15384e+06 3.08624e+07
75619 20230908.14 27206.7 2.51822e+07 71512.6 0.792552 45711.8 47721.1 53565.9 4169.8 13892.6 1.88908e+07 13918.6 1.05021e+07 17033 15383.3 1.46964e+07 19433.3 17333.6 14800.1 9828.73 1447 1.25993e+07 6791.3 1.67936e+07 6879.8 6.30784e+06 5749.43 1.67936e+07 46035.4 5721.31 1.67936e+07 3985.08 1.67936e+07 831032 1.18459e+06 8.14194e+06 3.08067e+07
75633 20230908.19 26426.9 2.30851e+07 87196.1 0.814514 43679.4 47559.5 53848.3 4427.3 13841.4 1.88908e+07 13952.4 1.05021e+07 17198.8 15293 1.46964e+07 19457.1 17581.4 14768.9 10298.4 1426.1 1.25993e+07 6803.4 1.67936e+07 6796.8 6.30784e+06 5780.48 1.67936e+07 40163.3 5455.24 1.67936e+07 3984.61 1.67936e+07 833682 1.18594e+06 8.13551e+06 3.05845e+07
75639 20230908.21 27149.3 2.51822e+07 86236.2 0.780733 45714.2 47797.3 54112.7 4489.1 13880 1.88908e+07 13884.3 1.05021e+07 17346.3 15315.7 1.46964e+07 19833.8 17596.5 14765.9 9895.98 1435.7 1.25993e+07 7182.95 1.67936e+07 6940.1 6.30784e+06 5791.25 1.67936e+07 46797.6 5708.59 1.67936e+07 3967.22 1.67936e+07 836115 1.1819e+06 8.14551e+06 3.06335e+07
75654 20230908.26 27195 2.51822e+07 89588.7 0.800096 43869.4 47485.2 54275.4 4469.5 13871.4 1.67936e+07 13956.2 1.05021e+07 17192.2 15367 1.46964e+07 19753.5 17307.3 15019.4 9817.01 1435.2 1.25993e+07 6841.62 1.88908e+07 6895.5 6.30784e+06 5790.81 1.67936e+07 43470.8 5688.99 1.67936e+07 3967.13 1.67936e+07 831294 1.18063e+06 8.16519e+06 3.08276e+07
75662 20230911.2 27181.8 2.51822e+07 83834.8 0.808688 45601.5 47690.4 53934.4 4406 13935.4 1.88908e+07 13957 1.05021e+07 17267 15499.6 1.46964e+07 18849.8 17581 14898.7 9856.76 1440.2 1.25993e+07 6826.9 1.67936e+07 7172.6 6.30784e+06 5746.37 1.67936e+07 44575.1 5756.56 1.67936e+07 3997.11 1.67936e+07 836042 1.18753e+06 8.15413e+06 3.15135e+07
75672 20230911.6 26990.3 2.30851e+07 75501.5 0.819773 43845.5 47682.4 54141 4457.3 13880 1.67936e+07 13947.8 1.05021e+07 17348 15361.7 1.46964e+07 19305 15082.7 14637.5 10070.8 1436.3 1.25993e+07 6809.97 1.88908e+07 6953.1 6.30784e+06 5793.21 1.67936e+07 43290.9 5761.62 1.67936e+07 3995.63 1.67936e+07 837710 1.17811e+06 8.15426e+06 3.07175e+07
75689 20230911.11 27924.5 2.51822e+07 71344 0.823735 44179.5 48569.2 55054.6 4427.2 14021.1 1.67936e+07 14105.4 1.05021e+07 16956.5 15658.3 1.25993e+07 19235.2 16861.3 14888.8 10027.2 1439.1 1.25993e+07 6789.15 1.88908e+07 6886.5 6.30784e+06 5751.1 1.67936e+07 44569.5 5791.93 1.67936e+07 3990.84 1.67936e+07 828507 1.1814e+06 8.15254e+06 3.08067e+07
75737 20230912.2 28245.3 2.30851e+07 66593.6 0.799989 45828 48672.7 55157 4401.2 14029.7 1.67936e+07 14130 1.05021e+07 17455.8 15650.9 1.46964e+07 19046.9 17397.5 14976.6 9848.82 1439.4 1.25993e+07 6851.6 1.67936e+07 6952.3 6.30784e+06 5810.95 1.67936e+07 45150.1 5776.87 1.67936e+07 4003.93 1.67936e+07 829130 1.18145e+06 8.15413e+06 3.08165e+07
75772 20230913.11 28279.8 2.30851e+07 88377.3 0.788811 45669.9 48638.1 54661.6 4470.9 14062.8 1.67936e+07 14175.1 1.05021e+07 17245.1 15715.1 1.25993e+07 19200.5 17151.2 16866.9 9889.62 1442.1 1.25993e+07 6915.48 1.67936e+07 7083 6.30784e+06 5767.63 1.67936e+07 44998.8 5777.31 1.67936e+07 3997.95 1.67936e+07 832119 1.18482e+06 8.15241e+06 3.12433e+07
75799 20230914.3 28106.1 2.30851e+07 87358.3 0.806205 45522.9 47807.1 54260.2 4440.7 14099.3 1.88908e+07 14222.8 1.05021e+07 17055.8 15712.5 1.25993e+07 19494.3 17556.9 15082 10417.4 1443.8 1.25993e+07 6861.85 1.67936e+07 7063 6.30784e+06 5764.98 1.67936e+07 39042 5779.31 1.67936e+07 4011.33 1.67936e+07 835858 1.18377e+06 8.15563e+06 3.10359e+07

misc_openssl3_fixes

build_id build_number pi_basic_mt_virtual_cft^ pi_basic_mt_sgx_cft^ pi_basic_mt_sgx_cft_mem Commit latency factor tpcc_virtual_cft^ ls_virtual_cft^ tpcc_sgx_cft^ tpcc_sgx_cft_mem pi_ls_virtual_cft^ pi_basic_virtual_cft^ pi_basic_js_virtual_cft^ ls_jwt_virtual_cft^ pi_ls_jwt_virtual_cft^ ls_sgx_cft^ ls_sgx_cft_mem ls_js_virtual_cft^ pi_ls_sgx_cft^ pi_ls_sgx_cft_mem ls_full_js_virtual_cft^ pi_basic_sgx_cft^ pi_basic_sgx_cft_mem ls_js_jwt_virtual_cft^ pi_basic_js_sgx_cft^ pi_basic_js_sgx_cft_mem ls_jwt_sgx_cft^ ls_jwt_sgx_cft_mem hist_sgx_cft^ pi_ls_jwt_sgx_cft^ pi_ls_jwt_sgx_cft_mem ls_js_sgx_cft^ ls_js_sgx_cft_mem ls_full_js_sgx_cft^ ls_full_js_sgx_cft_mem ls_js_jwt_sgx_cft^ ls_js_jwt_sgx_cft_mem RB put (/s)^ CHAMP put (/s)^ RB get (/s)^ CHAMP get (/s)^
75768 20230913.9 82457.4 28086.2 2.51822e+07 0.807272 17397.3 45850.2 5651.48 8.59996e+07 48567.5 54446 4454.8 17050 19041.1 14086.8 1.88908e+07 17587.2 14132.2 1.05021e+07 15100.2 15664.7 1.25993e+07 10402.9 1447.4 1.25993e+07 6896.08 1.67936e+07 44903.5 6932.5 6.30784e+06 5808.12 1.67936e+07 5714.05 1.67936e+07 3998.41 1.67936e+07 819326 1.17781e+06 8.15491e+06 2.9836e+07
75777 20230913.12 66339.3 28071.9 2.30851e+07 0.845744 16959.8 43652.8 5597.5 8.59996e+07 45578.6 53926.6 4411.7 16909.1 19254.1 14070.4 1.67936e+07 17260.4 14097.2 1.05021e+07 14757.7 15700.6 1.46964e+07 10356.3 1440.7 1.25993e+07 6850.55 1.88908e+07 38678.7 7090 6.30784e+06 5804.49 1.67936e+07 5774.41 1.67936e+07 3996.31 1.67936e+07 838419 1.17687e+06 8.15524e+06 3.07203e+07
75805 20230914.5 67892.3 28094.9 2.51822e+07 0.789969 17405.5 45624.9 5604.17 8.59996e+07 48325.3 54434.9 4446.1 17061.9 19056.3 14076.9 1.88908e+07 17686.8 14118.7 1.05021e+07 15000 15666.5 1.46964e+07 9743.6 1441.1 1.25993e+07 6850.97 1.67936e+07 44798.1 6921.8 6.30784e+06 5813.7 1.67936e+07 5790.95 1.67936e+07 3997.22 1.67936e+07 832040 1.18142e+06 8.14683e+06 3.08294e+07

images

@jumaffre jumaffre enabled auto-merge (squash) September 14, 2023 09:13
@jumaffre jumaffre merged commit 4d74c1d into microsoft:main Sep 14, 2023
23 of 28 checks passed
@ccf-bot
Copy link
Collaborator

ccf-bot commented Sep 14, 2023

💔 All backports failed

Status Branch Result
❌ release/4.x Backport failed because of merge conflicts

You might need to backport the following PRs to release/4.x:
- Remove our copy of attestation container now that it has moved repos (#5533)

Manual backport

To create the backport manually run:

backport --pr 5650

Questions ?

Please refer to the Backport tool documentation and see the Github Action logs for details

@jumaffre jumaffre mentioned this pull request Sep 14, 2023
Merged
@jumaffre jumaffre added the backported This PR was successfully backported to LTS branch label Sep 14, 2023
jumaffre added a commit to jumaffre/CCF that referenced this pull request Sep 14, 2023
@jumaffre
Misc OpenSSL 3.x fixes (microsoft#5650)
1d84b2b 
(cherry picked from commit 4d74c1d)

# Conflicts:
#	CMakeLists.txt
#	src/apps/tpcc/clients/tpcc_client.cpp
#	src/apps/tpcc/tpcc.cmake
#	src/indexing/test/indexing.cpp
jumaffre added a commit that referenced this pull request Sep 15, 2023
@jumaffre
[release/4.x] Cherry pick: Misc OpenSSL 3.x fixes (#5650) (#5654)
f256a69 
Co-authored-by: Julien Maffre <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eddyashton eddyashton eddyashton left review comments

@achamayou achamayou achamayou approved these changes

Assignees
No one assigned
Labels
4.x-todo PRs which should be backported to 4.x auto-backport Automatically backport this PR to LTS branch backported This PR was successfully backported to LTS branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jumaffre @ccf-bot @achamayou @eddyashton