Skip to content

[fix](grace-stop) remove heartbeat condition #58019

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
morningman merged 1 commit into from
Nov 15, 2025
Merged

[fix](grace-stop) remove heartbeat condition #58019

morningman merged 1 commit into from
Nov 15, 2025

Conversation

@morningman
Copy link
Contributor

@morningman morningman commented Nov 14, 2025

Followup #56601

@hello-stephen
Copy link
Contributor

hello-stephen commented Nov 14, 2025

Thank you for your contribution to Apache Doris.
Don't know what should be done next? See How to process your PR.

Please clearly describe your PR:

  1. What problem was fixed (it's best to include specific error reporting information). How it was fixed.
  2. Which behaviors were modified. What was the previous behavior, what is it now, why was it modified, and what possible impacts might there be.
  3. What features were added. Why was this function added?
  4. Which code was refactored and why was this part of the code refactored?
  5. Which functions were optimized and what is the difference before and after the optimization?

@morningman
Copy link
Contributor Author

morningman commented Nov 14, 2025

run buildall

@doris-robot
Copy link

doris-robot commented Nov 14, 2025

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

------ Round 1 ----------------------------------
q1	17607	5292	5098	5098
q2	2024	313	202	202
q3	10286	1308	736	736
q4	10245	962	366	366
q5	7457	2399	2385	2385
q6	182	169	134	134
q7	933	781	627	627
q8	9341	1296	1135	1135
q9	7077	5231	5185	5185
q10	6907	2233	1813	1813
q11	491	299	295	295
q12	363	365	235	235
q13	17765	3703	3025	3025
q14	233	234	209	209
q15	603	506	500	500
q16	1034	990	944	944
q17	576	886	371	371
q18	7342	7205	6976	6976
q19	1086	942	544	544
q20	347	356	225	225
q21	3745	3235	2291	2291
q22	1075	1063	1004	1004
Total cold run time: 106719 ms
Total hot run time: 34300 ms

----- Round 2, with runtime_filter_mode=off -----
q1	5181	5131	5124	5124
q2	250	334	239	239
q3	2189	2680	2311	2311
q4	1383	1765	1341	1341
q5	4239	4398	4522	4398
q6	227	180	134	134
q7	2058	1994	1755	1755
q8	2725	2683	2514	2514
q9	7318	7319	7364	7319
q10	3089	3252	2803	2803
q11	583	512	506	506
q12	684	779	605	605
q13	3479	3932	3314	3314
q14	300	309	302	302
q15	571	668	560	560
q16	1068	1092	1037	1037
q17	1207	1528	1473	1473
q18	8046	7730	7617	7617
q19	820	817	842	817
q20	2039	1953	1842	1842
q21	4828	4401	4229	4229
q22	1086	1016	1013	1013
Total cold run time: 53370 ms
Total hot run time: 51253 ms

@doris-robot
Copy link

doris-robot commented Nov 14, 2025

TPC-DS: Total hot run time: 187859 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 0e056a0ea8af3189faa4b59a01f6af834f31d111, data reload: false

query1	1000	407	397	397
query2	6568	1737	1718	1718
query3	6750	230	226	226
query4	26018	23496	23632	23496
query5	4410	669	502	502
query6	348	255	239	239
query7	4661	514	304	304
query8	320	261	244	244
query9	8701	2634	2602	2602
query10	486	339	296	296
query11	15695	15097	14852	14852
query12	176	122	118	118
query13	1717	558	440	440
query14	10665	9121	9158	9121
query15	199	192	174	174
query16	7221	679	500	500
query17	1224	725	600	600
query18	1982	412	320	320
query19	217	201	167	167
query20	129	125	121	121
query21	210	132	112	112
query22	4016	4122	3995	3995
query23	33894	33112	33074	33074
query24	8419	2429	2444	2429
query25	629	544	487	487
query26	1243	275	164	164
query27	2752	506	358	358
query28	4363	2241	2222	2222
query29	863	646	520	520
query30	303	227	199	199
query31	946	793	727	727
query32	93	77	76	76
query33	614	390	334	334
query34	798	855	531	531
query35	824	852	760	760
query36	952	1011	899	899
query37	124	112	88	88
query38	3512	3548	3513	3513
query39	1512	1421	1420	1420
query40	230	133	126	126
query41	67	64	63	63
query42	133	109	112	109
query43	490	516	468	468
query44	1255	783	756	756
query45	183	185	178	178
query46	884	993	647	647
query47	1761	1799	1685	1685
query48	398	435	332	332
query49	788	537	428	428
query50	662	685	411	411
query51	3844	4000	3845	3845
query52	114	112	107	107
query53	262	286	192	192
query54	326	306	289	289
query55	88	91	86	86
query56	337	346	320	320
query57	1197	1180	1107	1107
query58	301	299	283	283
query59	2528	2667	2656	2656
query60	356	378	339	339
query61	156	155	154	154
query62	779	745	683	683
query63	231	197	197	197
query64	4488	1138	829	829
query65	4053	3982	3994	3982
query66	1182	439	336	336
query67	15396	15296	14935	14935
query68	8251	930	598	598
query69	483	319	283	283
query70	1318	1274	1205	1205
query71	500	342	312	312
query72	6121	4844	4901	4844
query73	675	580	364	364
query74	8808	9178	8715	8715
query75	3888	3308	2778	2778
query76	3772	1181	733	733
query77	817	425	314	314
query78	9622	9647	8834	8834
query79	2069	839	606	606
query80	650	570	487	487
query81	491	263	235	235
query82	451	161	134	134
query83	294	266	245	245
query84	308	112	88	88
query85	913	473	431	431
query86	341	294	293	293
query87	3714	3633	3566	3566
query88	3081	2264	2258	2258
query89	392	326	284	284
query90	1950	220	216	216
query91	168	184	143	143
query92	80	67	68	67
query93	1162	966	655	655
query94	714	394	359	359
query95	408	336	305	305
query96	495	589	279	279
query97	2899	2989	2824	2824
query98	231	212	216	212
query99	1442	1422	1304	1304
Total cold run time: 273551 ms
Total hot run time: 187859 ms

@doris-robot
Copy link

doris-robot commented Nov 14, 2025

ClickBench: Total hot run time: 27.52 s 
machine: 'aliyun_ecs.c7a.8xlarge_32C64G'
scripts: https://github.com/apache/doris/tree/master/tools/clickbench-tools
ClickBench test result on commit 0e056a0ea8af3189faa4b59a01f6af834f31d111, data reload: false

query1	0.05	0.05	0.05
query2	0.09	0.05	0.05
query3	0.25	0.08	0.08
query4	1.62	0.11	0.12
query5	0.27	0.25	0.26
query6	1.19	0.65	0.64
query7	0.02	0.02	0.03
query8	0.06	0.05	0.04
query9	0.58	0.52	0.53
query10	0.58	0.58	0.59
query11	0.16	0.11	0.11
query12	0.14	0.11	0.12
query13	0.62	0.61	0.60
query14	1.02	1.01	1.00
query15	0.86	0.84	0.84
query16	0.41	0.39	0.38
query17	1.06	1.01	1.02
query18	0.21	0.20	0.20
query19	1.91	1.88	1.82
query20	0.02	0.02	0.02
query21	15.43	0.17	0.13
query22	5.22	0.07	0.04
query23	15.67	0.26	0.09
query24	2.88	0.79	0.42
query25	0.08	0.05	0.06
query26	0.14	0.13	0.14
query27	0.07	0.05	0.05
query28	4.34	1.12	0.93
query29	12.58	3.94	3.25
query30	0.29	0.13	0.11
query31	2.82	0.58	0.38
query32	3.23	0.55	0.47
query33	3.01	3.03	3.03
query34	15.81	5.19	4.56
query35	4.63	4.60	4.67
query36	0.68	0.50	0.50
query37	0.09	0.07	0.06
query38	0.07	0.04	0.04
query39	0.04	0.03	0.03
query40	0.16	0.14	0.13
query41	0.09	0.03	0.04
query42	0.04	0.03	0.02
query43	0.04	0.04	0.04
Total cold run time: 98.53 s
Total hot run time: 27.52 s

dataroaring
dataroaring approved these changes Nov 15, 2025
View reviewed changes
Copy link
Contributor

@dataroaring dataroaring left a comment

Choose a reason for hiding this comment

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

LGTM

@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Nov 15, 2025
@github-actions
Copy link
Contributor

github-actions bot commented Nov 15, 2025

PR approved by at least one committer and no changes requested.

@github-actions
Copy link
Contributor

github-actions bot commented Nov 15, 2025

PR approved by anyone and no changes requested.

@morningman morningman mentioned this pull request Nov 15, 2025
Merged
@morningman morningman merged commit 915b337 into apache:master Nov 15, 2025
29 of 31 checks passed
github-actions bot pushed a commit that referenced this pull request Nov 15, 2025
@morningman
[fix](grace-stop) remove heartbeat condition (#58019)
9330178 
Followup #56601
@github-actions github-actions bot mentioned this pull request Nov 15, 2025
Merged
morningman added a commit that referenced this pull request Nov 19, 2025
@morningman
branch-3.1: [fix](grace-stop) remove heartbeat condition#58019 (#58047)
ad2890d 
bp #58019
morrySnow pushed a commit that referenced this pull request Nov 19, 2025
@github-actions @morningman
branch-3.1: [fix](grace-stop) remove heartbeat condition #58019 (#58055)
be1b122 
Cherry-picked from #58019

Co-authored-by: Mingyu Chen (Rayner) <morningman@163.com>
morningman added a commit to morningman/doris that referenced this pull request Nov 29, 2025
@morningman
[fix](grace-stop) remove heartbeat condition (apache#58019)
1128939 
Followup apache#56601
@morningman morningman mentioned this pull request Nov 29, 2025
Merged
yiguolei pushed a commit that referenced this pull request Dec 2, 2025
@morningman
branch-4.0: [opt](scheduler) Improve Graceful Shutdown Behavior for B…
ad76d9d 
…E and FE, and Optimize Query Retry During BE Shutdown #56601 #58019 (#58526)

bp #56601 #58019
@yiguolei yiguolei removed the dev/4.0.x label Dec 2, 2025
nagisa-kunhah pushed a commit to nagisa-kunhah/doris that referenced this pull request Dec 14, 2025
@morningman @nagisa-kunhah
[fix](grace-stop) remove heartbeat condition (apache#58019)
9a3ead1 
Followup apache#56601
w41ter pushed a commit to w41ter/incubator-doris that referenced this pull request Dec 26, 2025
@morningman
cloud-4.0: [opt](scheduler) Improve Graceful Shutdown Behavior for BE…
a392d16 
… and FE, and Optimize Query Retry During BE Shutdown apache#56601 apache#58019 (apache#6169)

bp apache#56601 apache#58019
yiguolei pushed a commit to yiguolei/incubator-doris that referenced this pull request Dec 30, 2025
@morningman
branch-3.0: [opt](scheduler) Improve Graceful Shutdown Behavior for B…
c5bf363 
…E and FE, and Optimize Query Retry During BE Shutdown apache#56601 apache#58019 apache#6169 (apache#6170)

bp apache#56601 apache#58019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@CalvinKirs CalvinKirs CalvinKirs approved these changes

@dataroaring dataroaring dataroaring approved these changes

@gavinchou gavinchou Awaiting requested review from gavinchou gavinchou is a code owner

@w41ter w41ter Awaiting requested review from w41ter w41ter is a code owner

Assignees

No one assigned

Labels

approved Indicates a PR has been approved by one committer. dev/3.1.3-merged dev/4.0.2-merged reviewed

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@morningman @hello-stephen @doris-robot @CalvinKirs @dataroaring @yiguolei