Skip to content

branch-3.1: [fix](be) Fix check_storage_vault deadlock #52541 #52603

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
Merged
morrySnow merged 1 commit into from
Jul 3, 2025
Merged

branch-3.1: [fix](be) Fix check_storage_vault deadlock #52541 #52603

morrySnow merged 1 commit into from
Jul 3, 2025

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Jul 1, 2025

Cherry-picked from #52541

@swjtu-zhanglei
[fix](be) Fix check_storage_vault deadlock (#52541)
6af0ec9 
* #51175 introduced a deadlock
problem:
1. the `sync_storage_vault()` func wait for heartbeat thread to set
config::meta_service_endpoint

2. the heartbeat thread wait for the `sync_storage_vault()` func success
to start
@github-actions github-actions bot requested a review from morrySnow as a code owner July 1, 2025 12:11
@morrySnow morrySnow closed this Jul 2, 2025
@morrySnow morrySnow reopened this Jul 2, 2025
@morrySnow
Copy link
Contributor

morrySnow commented Jul 2, 2025

run buildall

@doris-robot
Copy link

doris-robot commented Jul 2, 2025

TPC-H: Total hot run time: 39603 ms 
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/tpch-tools
Tpch sf100 test result on commit 6af0ec915777921109f8b655369990e3678c2b48, data reload: false

------ Round 1 ----------------------------------
q1	17805	6928	6700	6700
q2	2074	177	167	167
q3	10626	1156	1218	1156
q4	10242	731	732	731
q5	7740	2889	2836	2836
q6	213	135	136	135
q7	979	625	615	615
q8	9362	1920	2057	1920
q9	6728	6429	6425	6425
q10	7064	2243	2300	2243
q11	473	280	269	269
q12	431	215	218	215
q13	17785	2970	2982	2970
q14	228	208	213	208
q15	517	462	479	462
q16	482	375	376	375
q17	981	587	509	509
q18	7409	6672	6644	6644
q19	1325	984	859	859
q20	472	208	206	206
q21	4110	3218	2962	2962
q22	1134	996	1008	996
Total cold run time: 108180 ms
Total hot run time: 39603 ms

----- Round 2, with runtime_filter_mode=off -----
q1	6634	6610	6566	6566
q2	327	231	233	231
q3	2886	2898	3026	2898
q4	2025	1831	1775	1775
q5	5702	5729	5694	5694
q6	213	128	125	125
q7	2284	1776	1842	1776
q8	3370	3505	3560	3505
q9	8717	8904	8901	8901
q10	3568	3527	3548	3527
q11	597	492	488	488
q12	829	610	590	590
q13	9790	3163	3120	3120
q14	299	267	270	267
q15	500	470	478	470
q16	476	455	446	446
q17	1843	1655	1635	1635
q18	8218	7941	7769	7769
q19	1717	1574	1526	1526
q20	2059	1817	1826	1817
q21	5184	4978	4972	4972
q22	1104	1006	1038	1006
Total cold run time: 68342 ms
Total hot run time: 59104 ms

@doris-robot
Copy link

doris-robot commented Jul 2, 2025

BE UT Coverage Report

Increment line coverage 0.00% (0/14) 🎉

Increment coverage report
Complete coverage report

Category Coverage
Function Coverage 45.05% (12380/27483)
Line Coverage 36.04% (109614/304186)
Region Coverage 35.12% (56825/161797)
Branch Coverage 32.24% (30824/95606)

@doris-robot
Copy link

doris-robot commented Jul 2, 2025

TPC-DS: Total hot run time: 195838 ms 
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/tpcds-tools
TPC-DS sf100 test result on commit 6af0ec915777921109f8b655369990e3678c2b48, data reload: false

query1	1286	925	884	884
query2	6265	1932	1870	1870
query3	10933	4547	4530	4530
query4	33030	23625	23395	23395
query5	3524	438	443	438
query6	256	179	197	179
query7	4010	318	328	318
query8	288	256	232	232
query9	9320	2572	2557	2557
query10	493	275	248	248
query11	17963	15082	15256	15082
query12	157	104	103	103
query13	1555	432	409	409
query14	8674	6547	7739	6547
query15	262	188	195	188
query16	8114	524	491	491
query17	1676	635	607	607
query18	2200	323	317	317
query19	386	165	165	165
query20	125	121	120	120
query21	209	107	104	104
query22	4863	4602	4385	4385
query23	34845	34289	33904	33904
query24	11221	2932	2936	2932
query25	684	435	429	429
query26	1294	180	184	180
query27	2513	359	365	359
query28	7524	2128	2190	2128
query29	903	475	479	475
query30	266	162	157	157
query31	1031	823	830	823
query32	92	58	56	56
query33	777	311	308	308
query34	936	494	493	493
query35	844	747	727	727
query36	1083	900	920	900
query37	132	70	66	66
query38	4066	3960	3947	3947
query39	1523	1616	1473	1473
query40	202	96	96	96
query41	47	46	49	46
query42	114	101	101	101
query43	519	510	490	490
query44	1272	836	811	811
query45	189	167	169	167
query46	1179	756	718	718
query47	2077	1926	1945	1926
query48	467	338	346	338
query49	968	414	393	393
query50	842	427	419	419
query51	7410	7207	7270	7207
query52	99	90	96	90
query53	261	186	178	178
query54	1311	464	472	464
query55	77	78	77	77
query56	263	250	240	240
query57	1322	1210	1219	1210
query58	224	216	215	215
query59	3394	3123	2998	2998
query60	290	261	249	249
query61	112	110	106	106
query62	807	696	690	690
query63	235	195	190	190
query64	5603	1040	638	638
query65	3305	3281	3314	3281
query66	1072	303	300	300
query67	16205	15515	15455	15455
query68	4054	594	590	590
query69	453	265	261	261
query70	1143	1115	1060	1060
query71	396	260	264	260
query72	6291	4017	4112	4017
query73	756	344	347	344
query74	10241	8864	9318	8864
query75	3367	2631	2642	2631
query76	2627	1038	1087	1038
query77	425	280	261	261
query78	10591	9615	9567	9567
query79	2240	606	615	606
query80	885	421	430	421
query81	548	217	226	217
query82	929	87	88	87
query83	244	143	137	137
query84	235	78	78	78
query85	1277	304	292	292
query86	441	302	285	285
query87	4369	4169	4231	4169
query88	3846	2420	2362	2362
query89	417	289	291	289
query90	2038	184	183	183
query91	142	110	107	107
query92	62	49	51	49
query93	2361	568	557	557
query94	866	290	291	290
query95	357	251	256	251
query96	621	285	287	285
query97	3289	3142	3152	3142
query98	215	197	194	194
query99	1560	1333	1325	1325
Total cold run time: 302475 ms
Total hot run time: 195838 ms

@morrySnow morrySnow merged commit 01682e2 into branch-3.1 Jul 3, 2025
19 of 22 checks passed
@github-actions github-actions bot deleted the auto-pick-52541-branch-3.1 branch July 3, 2025 04:19
etah000 pushed a commit to etah000/doris that referenced this pull request Jul 7, 2025
@github-actions @swjtu-zhanglei @etah000
branch-3.1: [fix](be) Fix check_storage_vault deadlock apache#52541 (a…
848a684 
…pache#52603)

Cherry-picked from apache#52541

Co-authored-by: Lei Zhang <zhanglei@selectdb.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@morrySnow morrySnow morrySnow approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@morrySnow @doris-robot @swjtu-zhanglei