Skip to content

branch-3.0-pick: [Fix](cloud) Should consider tablet state change whether to skip sync_rowsets in publish phase (#48400) #48667

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
hello-stephen merged 1 commit into from
Mar 10, 2025
Merged

branch-3.0-pick: [Fix](cloud) Should consider tablet state change whether to skip sync_rowsets in publish phase (#48400) #48667

hello-stephen merged 1 commit into from
Mar 10, 2025

Conversation

@bobhan1
Copy link
Contributor

@bobhan1 bobhan1 commented Mar 5, 2025

pick #48400

@bobhan1 bobhan1 requested a review from dataroaring as a code owner March 5, 2025 03:16
@Thearas
Copy link
Contributor

Thearas commented Mar 5, 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?

@bobhan1
Copy link
Contributor Author

bobhan1 commented Mar 5, 2025

run buildall

@doris-robot
Copy link

doris-robot commented Mar 5, 2025

TeamCity cloud ut coverage result:
Function Coverage: 82.26% (1062/1291)
Line Coverage: 65.76% (17617/26790)
Region Coverage: 65.27% (8677/13294)
Branch Coverage: 55.25% (4683/8476)
Coverage Report: http://coverage.selectdb-in.cc/coverage/8ce0f46e64734d8e4fcadfc8ebeada36d22e1e77_8ce0f46e64734d8e4fcadfc8ebeada36d22e1e77_cloud/report/index.html

@bobhan1
Copy link
Contributor Author

bobhan1 commented Mar 5, 2025

run cloud_p0

@bobhan1 bobhan1 force-pushed the branch-3.0-pick-48400 branch from 8ce0f46 to 8a90657 Compare March 6, 2025 02:12
@bobhan1
Copy link
Contributor Author

bobhan1 commented Mar 6, 2025

run buildall

@doris-robot
Copy link

doris-robot commented Mar 6, 2025

TeamCity cloud ut coverage result:
Function Coverage: 82.26% (1062/1291)
Line Coverage: 65.79% (17625/26790)
Region Coverage: 65.30% (8681/13294)
Branch Coverage: 55.32% (4689/8476)
Coverage Report: http://coverage.selectdb-in.cc/coverage/8a906578b6573fa4b06bf249e16b2f3b927801a8_8a906578b6573fa4b06bf249e16b2f3b927801a8_cloud/report/index.html

@dataroaring dataroaring force-pushed the branch-3.0-pick-48400 branch from 8a90657 to d2037db Compare March 7, 2025 02:17
@dataroaring
Copy link
Contributor

dataroaring commented Mar 7, 2025

run buildall

@doris-robot
Copy link

doris-robot commented Mar 7, 2025

TeamCity cloud ut coverage result:
Function Coverage: 82.26% (1062/1291)
Line Coverage: 65.79% (17625/26790)
Region Coverage: 65.29% (8679/13294)
Branch Coverage: 55.30% (4687/8476)
Coverage Report: http://coverage.selectdb-in.cc/coverage/d2037db28d818cf6990c56bea134aea0cc391dad_d2037db28d818cf6990c56bea134aea0cc391dad_cloud/report/index.html

@doris-robot
Copy link

doris-robot commented Mar 7, 2025

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

------ Round 1 ----------------------------------
q1	17591	6898	6719	6719
q2	2048	169	168	168
q3	10642	1109	1200	1109
q4	10532	828	797	797
q5	7731	3009	2882	2882
q6	222	132	131	131
q7	1020	628	612	612
q8	9364	2064	2111	2064
q9	6731	6447	6509	6447
q10	7016	2350	2294	2294
q11	473	262	264	262
q12	428	217	216	216
q13	17772	2982	2979	2979
q14	238	218	221	218
q15	531	475	465	465
q16	643	589	588	588
q17	1020	583	527	527
q18	7378	6679	6750	6679
q19	1401	1105	1133	1105
q20	505	217	196	196
q21	4067	3347	3176	3176
q22	1149	965	1025	965
Total cold run time: 108502 ms
Total hot run time: 40599 ms

----- Round 2, with runtime_filter_mode=off -----
q1	6673	6638	6703	6638
q2	335	237	241	237
q3	2932	2847	2974	2847
q4	2070	1840	1854	1840
q5	5775	5786	5784	5784
q6	217	130	126	126
q7	2245	1827	1798	1798
q8	3456	3587	3538	3538
q9	8964	8946	8963	8946
q10	3562	3550	3570	3550
q11	605	497	486	486
q12	793	619	592	592
q13	9369	3222	3185	3185
q14	311	270	276	270
q15	515	481	465	465
q16	698	666	633	633
q17	1867	1664	1605	1605
q18	8445	7706	7866	7706
q19	1738	1583	1609	1583
q20	2095	1871	1894	1871
q21	5584	5407	5298	5298
q22	1126	1075	1025	1025
Total cold run time: 69375 ms
Total hot run time: 60023 ms

@doris-robot
Copy link

doris-robot commented Mar 7, 2025

TPC-DS: Total hot run time: 197000 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 d2037db28d818cf6990c56bea134aea0cc391dad, data reload: false

query1	1300	907	914	907
query2	6260	2015	1973	1973
query3	10939	4357	4450	4357
query4	61834	28447	23239	23239
query5	5135	477	451	451
query6	413	180	190	180
query7	5508	315	319	315
query8	319	226	229	226
query9	8765	2605	2585	2585
query10	465	268	265	265
query11	17816	15547	15517	15517
query12	163	104	101	101
query13	1499	455	442	442
query14	10610	6811	7224	6811
query15	208	186	187	186
query16	7244	523	531	523
query17	1142	623	607	607
query18	1872	342	312	312
query19	219	167	158	158
query20	119	112	110	110
query21	211	107	106	106
query22	4659	4584	4627	4584
query23	34610	33948	34021	33948
query24	6243	2870	3027	2870
query25	546	416	428	416
query26	665	168	172	168
query27	1843	363	360	360
query28	4321	2542	2450	2450
query29	687	434	442	434
query30	258	167	162	162
query31	982	818	848	818
query32	66	56	62	56
query33	421	284	281	281
query34	928	518	511	511
query35	870	717	746	717
query36	1112	967	1013	967
query37	116	71	66	66
query38	4158	3977	3962	3962
query39	1505	1499	1477	1477
query40	208	107	103	103
query41	51	52	47	47
query42	116	101	101	101
query43	550	505	489	489
query44	1174	821	827	821
query45	187	168	164	164
query46	1155	728	717	717
query47	2000	1902	1924	1902
query48	481	385	377	377
query49	715	394	396	394
query50	874	420	417	417
query51	7352	7382	7175	7175
query52	103	92	94	92
query53	258	186	191	186
query54	589	462	459	459
query55	79	76	75	75
query56	270	246	253	246
query57	1315	1170	1145	1145
query58	213	203	218	203
query59	3285	2902	2816	2816
query60	278	249	252	249
query61	108	107	108	107
query62	759	682	675	675
query63	221	190	185	185
query64	1361	678	631	631
query65	3250	3233	3351	3233
query66	689	299	302	299
query67	15933	15712	15771	15712
query68	4305	591	578	578
query69	419	299	265	265
query70	1132	1158	1146	1146
query71	368	269	247	247
query72	6388	4066	4040	4040
query73	753	347	360	347
query74	10465	8944	9173	8944
query75	3355	2630	2650	2630
query76	1943	1067	996	996
query77	465	275	265	265
query78	10636	9619	9526	9526
query79	1434	593	602	593
query80	877	428	440	428
query81	517	243	240	240
query82	1269	89	89	89
query83	169	149	150	149
query84	294	87	76	76
query85	861	323	291	291
query86	320	303	311	303
query87	4478	4158	4228	4158
query88	3649	2429	2386	2386
query89	425	299	295	295
query90	2041	187	189	187
query91	192	148	167	148
query92	57	52	50	50
query93	1924	559	561	559
query94	751	299	303	299
query95	354	261	253	253
query96	614	282	292	282
query97	3324	3127	3193	3127
query98	220	199	199	199
query99	1564	1266	1284	1266
Total cold run time: 315168 ms
Total hot run time: 197000 ms

@doris-robot
Copy link

doris-robot commented Mar 7, 2025

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

query1	0.04	0.03	0.03
query2	0.09	0.04	0.05
query3	0.23	0.05	0.05
query4	1.65	0.09	0.09
query5	0.51	0.51	0.51
query6	1.14	0.74	0.75
query7	0.02	0.04	0.02
query8	0.06	0.05	0.05
query9	0.55	0.50	0.50
query10	0.56	0.56	0.58
query11	0.17	0.12	0.12
query12	0.16	0.13	0.12
query13	0.61	0.60	0.60
query14	2.74	2.84	2.89
query15	0.91	0.84	0.85
query16	0.38	0.36	0.38
query17	1.07	1.04	1.07
query18	0.19	0.19	0.21
query19	1.96	1.85	1.95
query20	0.02	0.02	0.01
query21	15.37	0.67	0.67
query22	5.44	6.23	1.84
query23	18.18	1.48	1.40
query24	2.28	0.23	0.22
query25	0.16	0.08	0.08
query26	0.25	0.18	0.19
query27	0.08	0.08	0.08
query28	13.23	0.60	0.56
query29	12.64	3.47	3.44
query30	0.25	0.06	0.06
query31	2.85	0.40	0.41
query32	3.24	0.49	0.48
query33	3.01	3.04	3.09
query34	16.76	4.59	4.57
query35	4.61	4.64	4.66
query36	0.65	0.50	0.48
query37	0.20	0.17	0.16
query38	0.17	0.16	0.15
query39	0.05	0.05	0.04
query40	0.17	0.13	0.13
query41	0.10	0.05	0.06
query42	0.06	0.05	0.04
query43	0.05	0.05	0.05
Total cold run time: 112.86 s
Total hot run time: 33.32 s

@bobhan1
Copy link
Contributor Author

bobhan1 commented Mar 7, 2025

run beut

1 similar comment
@bobhan1
Copy link
Contributor Author

bobhan1 commented Mar 8, 2025

run beut

@bobhan1
[Fix](cloud) Should consider tablet state change whether to skip `syn…
5e9a40b 
…c_rowsets` in publish phase (apache#48400)

considering the following situation:

1. heavy SC begins
2. alter task on tablet X(to tablet Y) is sent to be1
3. be1 shutdown for some reason
4. new loads on new tablet Y are routed to be2(which will skip to
calculate delete bitmaps in commit phase and publish phase because the
tablet's state is `NOT_READY`)
5. be1 restarted and resumed to do alter task
6. alter task on be1 finished and change the tablet's state to `RUNNING`
in MS
7. some load on tablet Y on be2 skip to calculate delete bitmap because
it doesn't know the tablet's state has changed, which will cause
duplicate key problem

Like apache#37670, this PR let the meta
service return the tablet states along with the
getDeleteBitmapUpdateLockResponse to FE and FE will send them to BE to
let the BE know whether it should sync_rowsets() due to tablet state
change on other BEs.
@bobhan1 bobhan1 force-pushed the branch-3.0-pick-48400 branch from d2037db to 5e9a40b Compare March 10, 2025 02:45
@bobhan1
Copy link
Contributor Author

bobhan1 commented Mar 10, 2025

run buildall

@doris-robot
Copy link

doris-robot commented Mar 10, 2025

TeamCity cloud ut coverage result:
Function Coverage: 82.26% (1062/1291)
Line Coverage: 65.79% (17625/26790)
Region Coverage: 65.30% (8681/13294)
Branch Coverage: 55.30% (4687/8476)
Coverage Report: http://coverage.selectdb-in.cc/coverage/5e9a40b1be3027087d71d89c354a183b419008df_5e9a40b1be3027087d71d89c354a183b419008df_cloud/report/index.html

dataroaring
dataroaring approved these changes Mar 10, 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 Mar 10, 2025
@github-actions
Copy link
Contributor

github-actions bot commented Mar 10, 2025

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

@github-actions
Copy link
Contributor

github-actions bot commented Mar 10, 2025

PR approved by anyone and no changes requested.

@doris-robot
Copy link

doris-robot commented Mar 10, 2025

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

------ Round 1 ----------------------------------
q1	17583	6826	6671	6671
q2	2072	164	186	164
q3	10620	1077	1118	1077
q4	10582	751	713	713
q5	7780	2949	2883	2883
q6	224	138	131	131
q7	985	611	605	605
q8	9352	1993	2064	1993
q9	6669	6468	6440	6440
q10	7014	2309	2341	2309
q11	462	269	264	264
q12	404	211	211	211
q13	17793	2962	2974	2962
q14	230	213	218	213
q15	516	461	458	458
q16	653	596	584	584
q17	990	608	631	608
q18	7447	6785	6672	6672
q19	1395	1125	1054	1054
q20	483	208	195	195
q21	4403	3365	3214	3214
q22	1108	982	1023	982
Total cold run time: 108765 ms
Total hot run time: 40403 ms

----- Round 2, with runtime_filter_mode=off -----
q1	6617	6655	6589	6589
q2	330	238	235	235
q3	2927	2865	2978	2865
q4	2064	1802	1859	1802
q5	5835	5774	5776	5774
q6	212	129	126	126
q7	2230	1878	1917	1878
q8	3390	3581	3574	3574
q9	8790	8994	8961	8961
q10	3569	3523	3499	3499
q11	585	488	506	488
q12	834	607	603	603
q13	9527	3183	3160	3160
q14	310	279	272	272
q15	519	488	470	470
q16	691	651	650	650
q17	1868	1663	1610	1610
q18	8247	8019	7825	7825
q19	1716	1586	1516	1516
q20	2065	1887	1898	1887
q21	5499	5367	5306	5306
q22	1145	1078	1014	1014
Total cold run time: 68970 ms
Total hot run time: 60104 ms

@doris-robot
Copy link

doris-robot commented Mar 10, 2025

TPC-DS: Total hot run time: 197734 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 5e9a40b1be3027087d71d89c354a183b419008df, data reload: false

query1	1310	926	903	903
query2	6271	2025	1994	1994
query3	10872	4120	4311	4120
query4	61347	28848	23651	23651
query5	5274	453	426	426
query6	398	170	202	170
query7	5464	319	312	312
query8	297	234	232	232
query9	8503	2631	2607	2607
query10	429	266	262	262
query11	17762	15106	15629	15106
query12	156	101	101	101
query13	1462	443	431	431
query14	10944	7248	7280	7248
query15	200	182	179	179
query16	7124	502	499	499
query17	1149	605	646	605
query18	1910	331	317	317
query19	210	164	160	160
query20	122	111	114	111
query21	209	100	102	100
query22	4784	4383	4650	4383
query23	34716	33991	33938	33938
query24	6324	2950	2933	2933
query25	549	446	434	434
query26	658	173	179	173
query27	1813	363	376	363
query28	4342	2507	2456	2456
query29	698	477	470	470
query30	241	168	167	167
query31	1024	846	840	840
query32	68	53	56	53
query33	427	279	278	278
query34	925	515	523	515
query35	843	730	735	730
query36	1090	963	970	963
query37	116	66	67	66
query38	4127	4076	3923	3923
query39	1529	1492	1530	1492
query40	203	97	96	96
query41	48	49	49	49
query42	120	108	107	107
query43	527	498	490	490
query44	1186	812	812	812
query45	192	168	181	168
query46	1200	740	744	740
query47	2002	1920	1944	1920
query48	462	398	413	398
query49	752	439	397	397
query50	851	435	439	435
query51	7794	7581	7554	7554
query52	108	92	88	88
query53	255	182	190	182
query54	575	482	481	481
query55	86	82	78	78
query56	266	252	242	242
query57	1301	1183	1139	1139
query58	215	222	221	221
query59	3239	2952	2994	2952
query60	270	245	250	245
query61	111	114	109	109
query62	770	673	669	669
query63	215	184	188	184
query64	1376	680	635	635
query65	3270	3170	3212	3170
query66	701	292	326	292
query67	15928	15681	15541	15541
query68	4241	564	562	562
query69	434	265	270	265
query70	1202	1131	1128	1128
query71	342	252	258	252
query72	6362	4043	3965	3965
query73	759	343	348	343
query74	10507	8956	9026	8956
query75	3398	2672	2693	2672
query76	1941	1071	1113	1071
query77	494	277	270	270
query78	10607	9638	9670	9638
query79	1132	593	591	591
query80	738	442	435	435
query81	507	234	244	234
query82	183	87	90	87
query83	161	143	148	143
query84	284	88	84	84
query85	814	296	284	284
query86	321	300	298	298
query87	4417	4364	4289	4289
query88	4086	2399	2392	2392
query89	417	291	293	291
query90	2014	185	183	183
query91	179	147	153	147
query92	66	48	50	48
query93	1444	550	559	550
query94	728	292	292	292
query95	348	253	248	248
query96	608	285	280	280
query97	3326	3145	3198	3145
query98	215	204	200	200
query99	1901	1295	1286	1286
Total cold run time: 313886 ms
Total hot run time: 197734 ms

@doris-robot
Copy link

doris-robot commented Mar 10, 2025

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

query1	0.03	0.03	0.04
query2	0.08	0.05	0.05
query3	0.24	0.06	0.07
query4	1.63	0.10	0.11
query5	0.52	0.50	0.51
query6	1.14	0.74	0.75
query7	0.04	0.02	0.02
query8	0.06	0.04	0.05
query9	0.57	0.50	0.49
query10	0.56	0.54	0.55
query11	0.16	0.12	0.11
query12	0.15	0.12	0.12
query13	0.60	0.61	0.60
query14	2.81	2.86	2.74
query15	0.92	0.83	0.84
query16	0.37	0.37	0.39
query17	1.00	1.06	1.00
query18	0.20	0.19	0.18
query19	1.91	1.80	2.07
query20	0.02	0.01	0.01
query21	15.35	0.70	0.68
query22	4.34	8.10	1.50
query23	18.27	1.39	1.32
query24	2.17	0.25	0.23
query25	0.14	0.08	0.08
query26	0.27	0.18	0.18
query27	0.08	0.07	0.08
query28	13.22	0.60	0.58
query29	12.63	3.38	3.36
query30	0.24	0.06	0.07
query31	2.85	0.40	0.40
query32	3.25	0.48	0.49
query33	2.99	3.04	3.09
query34	17.03	4.45	4.49
query35	4.61	4.53	4.60
query36	0.66	0.50	0.50
query37	0.20	0.16	0.18
query38	0.17	0.15	0.15
query39	0.05	0.04	0.04
query40	0.16	0.14	0.13
query41	0.10	0.05	0.05
query42	0.07	0.05	0.05
query43	0.06	0.04	0.05
Total cold run time: 111.92 s
Total hot run time: 32.41 s

@hello-stephen hello-stephen merged commit f7ed946 into apache:branch-3.0 Mar 10, 2025
21 of 23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dataroaring dataroaring dataroaring approved these changes

Assignees

No one assigned

Labels

approved Indicates a PR has been approved by one committer. reviewed

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@bobhan1 @Thearas @doris-robot @dataroaring @hello-stephen