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

Pass enclave path as CLI argument rather than in configuration #5665

Merged
merged 14 commits into from
Sep 21, 2023
Merged

Pass enclave path as CLI argument rather than in configuration #5665

merged 14 commits into from
Sep 21, 2023

Conversation

eddyashton
Copy link
Member

@eddyashton eddyashton commented Sep 19, 2023 •
edited
Loading

#5384

We haven't deprecated a configuration option before, so I'm inventing the process here. There's a new CLI option that will be preferred if it is present. If it is not present, but the config entry is, we'll use the config entry and log a warning. The config entry is listed in the schema but no longer required. A future removal step should simply remove it from the schema (and struct definition), and remove the fallback assignment in the code.

NB: Still need to do the same for attestation.security_context_directory, will do that in a separate PR.

@eddyashton eddyashton requested a review from a team September 19, 2023 10:31
jumaffre
jumaffre reviewed Sep 19, 2023
View reviewed changes
src/host/main.cpp Outdated Show resolved Hide resolved
jumaffre
jumaffre approved these changes Sep 19, 2023
View reviewed changes
Copy link
Contributor

@jumaffre jumaffre left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the daily canary should be touched so that we check that we can still spin up very old nodes?

@ghost
Copy link

ghost commented Sep 19, 2023 •
edited by ghost
Loading

pass_enclave_path_on_cli@76208 aka 20230921.18 vs main ewma over 20 builds from 75737 to 76203

Click to see table

main

build_id build_number pi_basic_mt_sgx_cft^ pi_basic_mt_sgx_cft_mem Commit latency factor pi_basic_mt_virtual_cft^ ls_virtual_cft^ pi_ls_virtual_cft^ pi_basic_virtual_cft^ ls_sgx_cft^ ls_sgx_cft_mem pi_ls_sgx_cft^ pi_ls_sgx_cft_mem pi_basic_sgx_cft^ pi_basic_sgx_cft_mem pi_basic_js_virtual_cft^ ls_jwt_virtual_cft^ pi_ls_jwt_virtual_cft^ ls_js_virtual_cft^ ls_full_js_virtual_cft^ pi_basic_js_sgx_cft^ pi_basic_js_sgx_cft_mem ls_js_jwt_virtual_cft^ 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)^ tpcc_virtual_cft^ tpcc_sgx_cft^ tpcc_sgx_cft_mem
75737 20230912.2 28245.3 2.30851e+07 0.799989 66593.6 45828 48672.7 55157 14029.7 1.67936e+07 14130 1.05021e+07 15650.9 1.46964e+07 4401.2 17455.8 19046.9 17397.5 14976.6 1439.4 1.25993e+07 9848.82 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 nan nan nan
75772 20230913.11 28279.8 2.30851e+07 0.788811 88377.3 45669.9 48638.1 54661.6 14062.8 1.67936e+07 14175.1 1.05021e+07 15715.1 1.25993e+07 4470.9 17245.1 19200.5 17151.2 16866.9 1442.1 1.25993e+07 9889.62 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 nan nan nan
75799 20230914.3 28106.1 2.30851e+07 0.806205 87358.3 45522.9 47807.1 54260.2 14099.3 1.88908e+07 14222.8 1.05021e+07 15712.5 1.25993e+07 4440.7 17055.8 19494.3 17556.9 15082 1443.8 1.25993e+07 10417.4 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 nan nan nan
75807 20230914.6 27691.2 2.72794e+07 0.78551 67424.6 45657.1 42493.5 55173.4 14039.5 1.67936e+07 14143.9 1.05021e+07 15706.6 1.46964e+07 4485.6 17097 19237.8 17069 14955.4 1444.6 1.25993e+07 9815.92 6835.29 1.67936e+07 7167.6 6.30784e+06 5814.42 1.67936e+07 47030.4 5740.11 1.67936e+07 4006.15 1.67936e+07 832713 1.1827e+06 8.15501e+06 3.08587e+07 17283.2 5625.94 8.59996e+07
75836 20230915.2 28225.2 2.51822e+07 0.806175 71131.7 45882.2 48155.9 55533.3 14058.9 1.67936e+07 14137 1.05021e+07 15692.2 1.46964e+07 4509.5 17429.7 19296.8 17117.5 14633.5 1446.3 1.25993e+07 9896.12 6865.75 1.88908e+07 6927.4 6.30784e+06 5761.62 1.67936e+07 41678 5745.27 1.67936e+07 4006.31 1.67936e+07 833529 1.17526e+06 8.15209e+06 3.07549e+07 17210.5 5618.1 8.59996e+07
75842 20230915.5 27975.1 2.51822e+07 0.812338 66045.1 45522.7 47870.5 54521.4 14057.6 1.67936e+07 14097.1 1.05021e+07 15647 1.46964e+07 4429.9 17019.5 19290.9 17063.7 14987.3 1438.9 1.25993e+07 10237.6 6863.63 1.67936e+07 6939.8 6.30784e+06 5785.28 1.67936e+07 41341.1 5782.56 1.67936e+07 4007.85 1.67936e+07 830832 1.18103e+06 8.1391e+06 3.03488e+07 17070.3 5598.47 8.59996e+07
75882 20230915.14 27598.1 2.51822e+07 0.79396 82541.5 45745 47701.7 54950.9 14070.2 1.88908e+07 14174.4 1.05021e+07 15653.1 1.46964e+07 4451.4 17193.1 19974.4 17175.9 14859.4 1446.3 1.05021e+07 10059.6 6863.13 1.88908e+07 7074 6.30784e+06 5781.81 1.67936e+07 41264.9 5780.46 1.67936e+07 4000.23 1.67936e+07 831777 1.18327e+06 8.17288e+06 3.10618e+07 17347.4 5657.84 8.59996e+07
75891 20230915.17 27847.3 2.30851e+07 0.812985 81063.5 45795.3 48452.4 54635 13993.8 1.67936e+07 14041.4 1.05021e+07 15427.5 1.46964e+07 4439.8 17018.8 19367.8 17619.6 14952.2 1429.7 1.25993e+07 9842.66 6863.77 1.88908e+07 7026.7 6.30784e+06 5820.89 1.67936e+07 40064.4 5489.42 1.67936e+07 3992.44 1.67936e+07 839722 1.17713e+06 8.17392e+06 3.07494e+07 17178.3 5497.14 8.59996e+07
75905 20230915.21 28013 2.51822e+07 0.794597 84235.8 46018.7 47955.2 55480.7 13971 1.88908e+07 14089.9 1.05021e+07 15562.1 1.46964e+07 4446.8 17077.2 19101.1 17045.6 16704.8 1430.6 1.25993e+07 10411.6 6840 1.88908e+07 6841 6.30784e+06 5780.32 1.67936e+07 39534.4 5754.13 1.67936e+07 3966.24 1.67936e+07 838322 1.18234e+06 8.14897e+06 3.10045e+07 17245 5560.01 8.59996e+07
75919 20230918.1 28037.7 2.51822e+07 0.807726 80251.8 45705.8 48106.5 54799.3 14069.4 1.88908e+07 14100.3 1.05021e+07 15624.7 1.46964e+07 4473.2 17309.5 19191.3 17711.8 15013 1447.6 1.25993e+07 9870.13 7246.59 1.67936e+07 6938.6 6.30784e+06 5817.38 1.67936e+07 45085.8 5750.83 1.88908e+07 4001.82 1.67936e+07 836473 1.18406e+06 8.15462e+06 3.0718e+07 17123.9 5617.99 8.59996e+07
75972 20230919.3 28013.6 2.51822e+07 0.797908 89712 45907.5 48087.1 54724 13979.5 1.88908e+07 14131.3 1.05021e+07 15590.4 1.46964e+07 4440.1 17023.5 19581.7 17397.5 14717.5 1440.2 1.25993e+07 10069 6847.99 1.88908e+07 7025.4 6.30784e+06 5812.09 1.67936e+07 46322.7 5786.4 1.67936e+07 3974.68 1.67936e+07 826226 1.18058e+06 8.15186e+06 3.07355e+07 17443 5600.61 8.59996e+07
75984 20230919.8 27995.4 2.51822e+07 0.791942 73482.4 45556.3 48588.5 54594.9 14054.7 1.88908e+07 14107 1.05021e+07 15616.2 1.46964e+07 4378.8 17238.5 19201.2 14682.5 15000.4 1440.3 1.25993e+07 9880.77 6841.78 1.67936e+07 7001.6 6.30784e+06 5811.6 1.67936e+07 43684.1 5785.63 1.67936e+07 3995.74 1.67936e+07 821876 1.17893e+06 8.13315e+06 3.27115e+07 17353.2 5656.14 8.59996e+07
76003 20230919.15 28110.3 2.51822e+07 0.823869 78893.3 45430.7 48253.5 54962.6 14103.4 1.88908e+07 14168.3 1.05021e+07 15708.5 1.46964e+07 4451 17315.5 19169.9 17304 15065.9 1456 1.25993e+07 9861.45 6930.48 1.88908e+07 7095.2 6.30784e+06 5821.17 1.67936e+07 45003 5749.41 1.67936e+07 3996.53 1.67936e+07 836289 1.18821e+06 8.14084e+06 3.21795e+07 17296.1 5596.5 8.59996e+07
76015 20230919.19 28252.3 2.30851e+07 0.780865 68481.1 45884.9 48693.3 55353.3 13933.9 1.67936e+07 14063 1.05021e+07 15454.5 1.25993e+07 4451.1 17089.2 19693.2 17055.5 14594.9 1445.3 1.25993e+07 9802.74 6833.42 1.88908e+07 6956.1 6.30784e+06 5764.29 1.67936e+07 43090.7 5741.3 1.67936e+07 3973.09 1.67936e+07 828277 1.17503e+06 8.16854e+06 3.05736e+07 17179.4 5582.98 8.80968e+07
76054 20230919.37 27635.8 2.30851e+07 0.767755 84164.5 43642.1 48127.4 51879.1 14039.8 1.88908e+07 14151.3 1.05021e+07 15693.4 1.25993e+07 4461.4 17346.6 19026.2 17520.1 14884.1 1444.8 1.25993e+07 10064.1 7221.43 1.67936e+07 7058.5 6.30784e+06 5780.5 1.67936e+07 39087.4 5743.01 1.67936e+07 4003.19 1.67936e+07 834363 1.18202e+06 8.13722e+06 3.07706e+07 17131.7 5608.14 8.59996e+07
76076 20230919.46 27742.6 2.51822e+07 0.841856 78567.6 45544.3 47874.6 53078.7 13972.3 1.88908e+07 14006.2 1.05021e+07 15504.1 1.46964e+07 4492.4 17214.5 16564.8 17135.5 14642.9 1431.1 1.25993e+07 9786.58 6868.27 1.88908e+07 6991 6.30784e+06 5792.24 1.67936e+07 44362.7 5488.53 1.67936e+07 3984.22 1.67936e+07 835522 1.18649e+06 8.15306e+06 3.0439e+07 17381.2 5535.46 8.59996e+07
76097 20230920.1 28027 2.30851e+07 0.771017 86385.1 45477.1 48221.6 55062.5 14031.1 1.67936e+07 14131.3 1.05021e+07 15471.1 1.46964e+07 4480.6 17201.5 19641.3 17217 14623.7 1446.5 1.25993e+07 9757.69 6850.31 1.67936e+07 6988.2 6.30784e+06 5784.34 1.67936e+07 36337.8 5750.9 1.67936e+07 3973.75 1.67936e+07 833307 1.18308e+06 8.15264e+06 3.09295e+07 17317 5650.74 8.59996e+07
76165 20230921.3 27623 2.30851e+07 0.768436 77456.4 45677.4 48197.9 55130.8 14067.6 1.67936e+07 14121.5 1.05021e+07 15674.5 1.25993e+07 4354.8 17117.4 19846 17049.8 16843.7 1441.9 1.25993e+07 9885.87 6846.38 1.67936e+07 7088.4 6.30784e+06 5774.38 1.67936e+07 45264.8 5777.07 1.67936e+07 3994.62 1.67936e+07 841894 1.18293e+06 8.17154e+06 3.14395e+07 17168.2 5585.9 8.59996e+07
76171 20230921.6 28181.5 2.51822e+07 0.835403 90391.4 45885 49813.7 55693 14063.7 1.88908e+07 14139.1 1.05021e+07 15638.1 1.46964e+07 4397.5 17248.2 19556.1 17048.7 14393.6 1438.5 1.25993e+07 9900.28 7263.82 1.67936e+07 6934.8 6.30784e+06 5777.83 1.67936e+07 47592.5 5739.47 1.67936e+07 3979.61 1.67936e+07 835535 1.18048e+06 8.14991e+06 3.10731e+07 17444 5590.06 8.59996e+07
76203 20230921.17 28117.4 2.51822e+07 0.786125 91230.3 45471.5 48425.7 55265.4 14046.3 1.88908e+07 14136.2 1.05021e+07 15702.1 1.25993e+07 4445 17069.4 19840.5 17208.3 16828.2 1451.3 1.25993e+07 9850.06 7265.93 1.67936e+07 6938.8 6.30784e+06 5812.78 1.67936e+07 41833.5 5731.91 1.88908e+07 4003.75 1.67936e+07 828314 1.18182e+06 8.15189e+06 3.14873e+07 17331.8 5590.41 8.59996e+07

pass_enclave_path_on_cli

build_id build_number pi_basic_mt_sgx_cft^ pi_basic_mt_sgx_cft_mem Commit latency factor tpcc_sgx_cft^ tpcc_sgx_cft_mem ls_sgx_cft^ ls_sgx_cft_mem pi_ls_sgx_cft^ pi_ls_sgx_cft_mem pi_basic_sgx_cft^ pi_basic_sgx_cft_mem 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 ls_full_js_sgx_cft^ ls_full_js_sgx_cft_mem ls_js_jwt_sgx_cft^ ls_js_jwt_sgx_cft_mem hist_sgx_cft^ RB put (/s)^ CHAMP put (/s)^ RB get (/s)^ CHAMP get (/s)^ pi_basic_mt_virtual_cft^ tpcc_virtual_cft^ ls_virtual_cft^ pi_ls_virtual_cft^ pi_basic_virtual_cft^ pi_basic_js_virtual_cft^ ls_jwt_virtual_cft^ pi_ls_jwt_virtual_cft^ ls_js_virtual_cft^ ls_full_js_virtual_cft^ ls_js_jwt_virtual_cft^
76010 20230919.17 28077 2.51822e+07 0.787503 5606.5 8.59996e+07 13991.4 1.88908e+07 14095.4 1.05021e+07 15523.1 1.25993e+07 1430 1.25993e+07 6847.08 1.88908e+07 6936.2 6.30784e+06 5771.63 1.67936e+07 5740.48 1.67936e+07 3968.66 1.67936e+07 46664.9 828001 1.18068e+06 8.15472e+06 3.08183e+07 64722.7 17298.7 45647.4 47415.4 54834.9 4428.6 17032.3 19813.4 17149.9 16812.5 9905.54
76033 20230919.26 28051.9 2.30851e+07 0.836195 5585.44 8.59996e+07 14044.6 1.88908e+07 14084.5 1.05021e+07 15660.9 1.25993e+07 1437.1 1.25993e+07 6862.45 1.88908e+07 7025.6 6.30784e+06 5769.35 1.67936e+07 5494.28 1.67936e+07 3989.47 1.67936e+07 44916 836249 1.18073e+06 8.15582e+06 3.20862e+07 87452.3 17314 45762 48432 54716.3 4427 17212.6 19519.8 17470.1 16709.2 9833.59
76064 20230919.40 27757 2.30851e+07 0.792835 5517.84 8.59996e+07 13927.8 1.88908e+07 14016.9 1.05021e+07 15434.8 1.46964e+07 1421.6 1.25993e+07 6773.36 1.88908e+07 6872.9 6.30784e+06 5803.16 1.67936e+07 5443.37 1.67936e+07 3955.93 1.67936e+07 45240.7 837867 1.18301e+06 8.14995e+06 3.08652e+07 76992.1 17123.7 45868.9 47587.1 54008.2 4456.5 17105.1 19110.6 17358.9 14869.4 10239.5
76189 20230921.12 27921.2 2.30851e+07 0.81938 5634.12 8.59996e+07 14067.2 1.67936e+07 14176.4 1.05021e+07 15729.1 1.25993e+07 1446.2 1.05021e+07 6844.71 1.67936e+07 7012.8 6.30784e+06 5808.1 1.67936e+07 5780.61 1.67936e+07 3999.83 1.67936e+07 41423.2 830193 1.18327e+06 8.16639e+06 3.07725e+07 62006.4 17120 43657.8 47080.5 53257.6 4361.6 17487 18757.2 17368.1 14910.5 10260.8
76208 20230921.18 27992.4 2.30851e+07 0.810174 5550.08 8.59996e+07 14007.7 1.88908e+07 14075.8 1.05021e+07 15465.4 1.46964e+07 1429.8 1.25993e+07 6821.17 1.88908e+07 7020.4 6.30784e+06 5799.7 1.67936e+07 5764.08 1.67936e+07 3998.18 1.67936e+07 38952.6 833410 1.18479e+06 8.14771e+06 3.08076e+07 80289.9 17420.3 46093.7 48803.3 55073.6 4491 17098.1 19732 16956.4 16851.1 10282.6

images

achamayou
achamayou reviewed Sep 19, 2023
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
@eddyashton eddyashton added auto-backport Automatically backport this PR to LTS branch 4.x-todo PRs which should be backported to 4.x labels Sep 19, 2023
@eddyashton eddyashton enabled auto-merge (squash) September 21, 2023 11:53
@eddyashton eddyashton merged commit a9be7ea into microsoft:main Sep 21, 2023
24 of 29 checks passed
@ghost
Copy link

ghost commented Sep 21, 2023

💔 All backports failed

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

Manual backport

To create the backport manually run:

backport --pr 5665

Questions ?

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

This was referenced Sep 21, 2023
Merged
Merged
@eddyashton eddyashton mentioned this pull request Sep 25, 2023
Merged
This was referenced Sep 28, 2023
Merged
Merged
@ghost ghost mentioned this pull request Oct 16, 2023
Merged
@eddyashton eddyashton mentioned this pull request Oct 17, 2023
Merged
@eddyashton eddyashton added the backported This PR was successfully backported to LTS branch label Oct 17, 2023
eddyashton added a commit to eddyashton/CCF that referenced this pull request Oct 17, 2023
@eddyashton
Pass enclave path as CLI argument rather than in configuration (micro…
492da0b 
…soft#5665)

(cherry picked from commit a9be7ea)
eddyashton added a commit that referenced this pull request Oct 17, 2023
@eddyashton
[release/4.x] Cherry pick: Pass enclave path as CLI argument rather t…
74b3481 
…han in configuration (#5665) (#5737)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jumaffre jumaffre jumaffre approved these changes

@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.
3 participants
@eddyashton @achamayou @jumaffre