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.

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

[fix](clone) Fix clone and alter tablet use same tablet path #34889

Merged
merged 12 commits into from
Jun 5, 2024

Conversation

deardeng
Copy link
Contributor

@deardeng deardeng commented May 15, 2024

Proposed changes

Issue Number: close #xxx

The entire process is as follows:

  1. Drop the tablet.
  2. Successfully clone the tablet in full.
  3. Start the incremental clone.
  4. Start to move the tablet to the trash (the process of actually cleaning the data begins from step 1, where the tablet was dropped).
  5. The incremental clone fails.
  6. The incremental clone is successfully retried.

Step 4 moved the data that was just pulled from the full clone to the trash, leading to data loss.
The failure in step 5 of the incremental clone was also due to the deletion of the just-pulled snapshot data.

Fix:
When cloning, check the tablet status and determine if the tablet directory has already been moved to the trash directory. If it has not been moved to the trash, the clone thread should help move it to the trash directory.

Further comments

If this is a relatively large or complex change, kick off the discussion at [email protected] by explaining why you chose the solution you did and what alternatives you considered, etc...

@deardeng deardeng marked this pull request as draft May 15, 2024 03:32
@doris-robot
Copy link

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

Since 2024-03-18, the Document has been moved to doris-website.
See Doris Document.

Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

clang-tidy made some suggestions

@@ -263,6 +263,9 @@ Status EngineCloneTask::_do_clone() {
&store, _clone_req.partition_id));
auto tablet_dir = fmt::format("{}/{}/{}", local_shard_root_path, _clone_req.tablet_id,
_clone_req.schema_hash);
auto tablet_manager = _engine.tablet_manager();
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: 'auto tablet_manager' can be declared as 'auto *tablet_manager' [readability-qualified-auto]

Suggested change
auto tablet_manager = _engine.tablet_manager();
auto *tablet_manager = _engine.tablet_manager();

@deardeng
Copy link
Contributor Author

run buildall

@doris-robot
Copy link

TeamCity be ut coverage result:
Function Coverage: 35.66% (9013/25278)
Line Coverage: 27.29% (74514/273036)
Region Coverage: 26.52% (38563/145398)
Branch Coverage: 23.37% (19666/84144)
Coverage Report: http://coverage.selectdb-in.cc/coverage/8de7e698efd806815a62eff67e7c0a4b9c1d8846_8de7e698efd806815a62eff67e7c0a4b9c1d8846/report/index.html

@doris-robot
Copy link

TPC-DS: Total hot run time: 172537 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 8de7e698efd806815a62eff67e7c0a4b9c1d8846, data reload: false

query1	943	376	373	373
query2	6453	2351	2384	2351
query3	6649	201	205	201
query4	19094	17411	17274	17274
query5	4120	418	413	413
query6	254	157	147	147
query7	4580	295	279	279
query8	240	187	185	185
query9	8717	2392	2350	2350
query10	443	273	252	252
query11	10656	10282	10264	10264
query12	126	88	87	87
query13	1633	359	353	353
query14	9257	7510	7498	7498
query15	233	169	175	169
query16	8091	260	251	251
query17	1861	534	526	526
query18	2075	302	272	272
query19	213	151	168	151
query20	93	86	84	84
query21	197	139	138	138
query22	4219	3967	4140	3967
query23	33525	32906	32920	32906
query24	11145	2953	2832	2832
query25	580	349	355	349
query26	1225	151	154	151
query27	3035	318	326	318
query28	7710	2032	2057	2032
query29	860	595	597	595
query30	302	174	179	174
query31	957	756	760	756
query32	95	77	51	51
query33	774	263	250	250
query34	1042	481	474	474
query35	742	605	587	587
query36	1052	871	904	871
query37	135	68	70	68
query38	2917	2810	2791	2791
query39	841	785	777	777
query40	196	122	121	121
query41	46	46	44	44
query42	103	98	95	95
query43	585	551	569	551
query44	1167	722	750	722
query45	177	167	164	164
query46	1066	719	697	697
query47	1853	1736	1764	1736
query48	367	301	288	288
query49	1125	391	383	383
query50	767	381	376	376
query51	6824	6901	6730	6730
query52	98	93	88	88
query53	348	279	285	279
query54	881	424	429	424
query55	74	73	74	73
query56	253	240	246	240
query57	1144	1053	1058	1053
query58	257	208	212	208
query59	3471	3082	3131	3082
query60	265	247	246	246
query61	107	103	108	103
query62	665	470	435	435
query63	310	285	282	282
query64	8996	2203	1693	1693
query65	3218	3083	3107	3083
query66	1401	327	322	322
query67	15359	14865	14726	14726
query68	4584	523	524	523
query69	485	275	265	265
query70	1127	1107	1101	1101
query71	394	267	263	263
query72	7438	5641	5289	5289
query73	703	320	313	313
query74	6091	5714	5704	5704
query75	3302	2656	2587	2587
query76	2554	948	1002	948
query77	416	262	266	262
query78	10312	9839	9905	9839
query79	2284	512	508	508
query80	978	437	425	425
query81	531	246	238	238
query82	632	94	92	92
query83	246	176	171	171
query84	236	86	87	86
query85	1749	310	303	303
query86	487	307	306	306
query87	3308	3201	3104	3104
query88	4181	2339	2342	2339
query89	479	389	395	389
query90	1987	187	186	186
query91	129	107	103	103
query92	66	50	52	50
query93	2107	512	490	490
query94	1205	190	188	188
query95	406	306	310	306
query96	591	265	268	265
query97	3164	3008	3081	3008
query98	324	219	217	217
query99	1074	858	862	858
Total cold run time: 271777 ms
Total hot run time: 172537 ms

@doris-robot
Copy link

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

query1	0.04	0.04	0.02
query2	0.08	0.04	0.04
query3	0.23	0.05	0.04
query4	1.66	0.08	0.10
query5	0.51	0.50	0.53
query6	1.11	0.73	0.72
query7	0.02	0.02	0.01
query8	0.05	0.03	0.04
query9	0.52	0.48	0.48
query10	0.55	0.54	0.52
query11	0.16	0.11	0.12
query12	0.14	0.12	0.12
query13	0.59	0.58	0.59
query14	0.78	0.79	0.76
query15	0.83	0.80	0.81
query16	0.37	0.36	0.38
query17	0.95	1.00	0.95
query18	0.21	0.26	0.24
query19	1.75	1.77	1.71
query20	0.01	0.01	0.01
query21	15.70	0.66	0.65
query22	3.99	7.70	1.72
query23	18.26	1.46	1.31
query24	1.62	0.25	0.24
query25	0.16	0.08	0.08
query26	0.26	0.16	0.17
query27	0.07	0.08	0.08
query28	13.40	1.01	0.99
query29	12.96	3.29	3.29
query30	0.24	0.06	0.06
query31	2.85	0.39	0.38
query32	3.29	0.47	0.47
query33	2.91	2.90	2.86
query34	17.10	4.35	4.38
query35	4.49	4.50	4.53
query36	0.66	0.45	0.45
query37	0.17	0.16	0.15
query38	0.15	0.16	0.15
query39	0.05	0.03	0.03
query40	0.17	0.15	0.14
query41	0.09	0.05	0.04
query42	0.05	0.04	0.05
query43	0.05	0.03	0.04
Total cold run time: 109.25 s
Total hot run time: 30.25 s

@deardeng
Copy link
Contributor Author

run buildall

Copy link
Collaborator

@yujun777 yujun777 left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

PR approved by anyone and no changes requested.

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17603	4312	4299	4299
q2	2001	192	208	192
q3	10437	1207	1225	1207
q4	10185	774	798	774
q5	7472	2695	2746	2695
q6	229	137	136	136
q7	956	617	604	604
q8	9234	2119	2083	2083
q9	9462	6673	6734	6673
q10	9129	3968	3887	3887
q11	456	248	253	248
q12	576	235	240	235
q13	17216	3252	3234	3234
q14	263	228	245	228
q15	523	471	478	471
q16	511	401	416	401
q17	979	716	666	666
q18	8285	7865	7867	7865
q19	6675	1567	1510	1510
q20	638	319	319	319
q21	5199	4065	4132	4065
q22	363	291	308	291
Total cold run time: 118392 ms
Total hot run time: 42083 ms

----- Round 2, with runtime_filter_mode=off -----
q1	4508	4422	4439	4422
q2	376	286	269	269
q3	3191	2876	2900	2876
q4	2048	1746	1616	1616
q5	5301	5505	5517	5505
q6	222	122	125	122
q7	2259	1851	1850	1850
q8	3235	3387	3409	3387
q9	8664	8630	8723	8630
q10	4127	3764	3715	3715
q11	582	517	504	504
q12	802	634	634	634
q13	16020	3158	3155	3155
q14	298	272	284	272
q15	526	498	473	473
q16	515	440	440	440
q17	1823	1507	1525	1507
q18	8072	7501	7464	7464
q19	1650	1556	1583	1556
q20	2002	1843	1834	1834
q21	8735	4769	4841	4769
q22	575	525	505	505
Total cold run time: 75531 ms
Total hot run time: 55505 ms

@doris-robot
Copy link

TeamCity be ut coverage result:
Function Coverage: 35.66% (9015/25278)
Line Coverage: 27.30% (74540/273047)
Region Coverage: 26.53% (38581/145418)
Branch Coverage: 23.39% (19684/84160)
Coverage Report: http://coverage.selectdb-in.cc/coverage/15b7664728e01ca4816764a1008c25ff9b406a9c_15b7664728e01ca4816764a1008c25ff9b406a9c/report/index.html

@doris-robot
Copy link

TPC-DS: Total hot run time: 168084 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 15b7664728e01ca4816764a1008c25ff9b406a9c, data reload: false

query1	911	379	377	377
query2	6435	2486	2204	2204
query3	6644	208	209	208
query4	19990	17254	17289	17254
query5	4091	431	418	418
query6	245	152	161	152
query7	4591	296	296	296
query8	235	187	183	183
query9	8602	2362	2359	2359
query10	461	336	254	254
query11	10624	10158	9997	9997
query12	133	91	88	88
query13	1662	374	353	353
query14	10091	6919	6227	6227
query15	216	175	167	167
query16	7593	275	265	265
query17	1297	524	527	524
query18	1787	275	266	266
query19	200	175	159	159
query20	95	87	85	85
query21	190	131	128	128
query22	4157	3994	3827	3827
query23	33750	32846	33001	32846
query24	7014	2938	2852	2852
query25	541	362	366	362
query26	705	157	156	156
query27	1940	331	330	330
query28	3791	2060	2065	2060
query29	839	612	598	598
query30	242	170	172	170
query31	958	797	761	761
query32	79	59	59	59
query33	521	292	278	278
query34	867	478	478	478
query35	708	640	581	581
query36	1054	929	925	925
query37	105	68	71	68
query38	2868	2805	2788	2788
query39	814	791	775	775
query40	193	126	123	123
query41	47	43	44	43
query42	104	94	100	94
query43	566	545	542	542
query44	1058	721	741	721
query45	170	160	171	160
query46	1060	696	721	696
query47	1858	1761	1758	1758
query48	396	293	306	293
query49	767	376	378	376
query50	795	400	394	394
query51	6870	6624	6656	6624
query52	102	95	95	95
query53	357	295	293	293
query54	541	469	426	426
query55	77	71	72	71
query56	263	240	238	238
query57	1115	1059	1058	1058
query58	262	212	212	212
query59	3380	3092	3077	3077
query60	270	247	251	247
query61	93	91	109	91
query62	564	447	442	442
query63	310	282	285	282
query64	3350	1757	1731	1731
query65	3169	3094	3090	3090
query66	803	337	322	322
query67	15292	14872	14855	14855
query68	4563	550	547	547
query69	442	272	269	269
query70	1110	1101	1045	1045
query71	362	278	277	277
query72	7444	2735	2616	2616
query73	714	330	324	324
query74	6044	5681	5562	5562
query75	3252	2627	2638	2627
query76	2149	988	996	988
query77	391	267	261	261
query78	10161	9666	9721	9666
query79	2548	513	511	511
query80	1072	440	435	435
query81	523	253	238	238
query82	943	100	94	94
query83	253	173	176	173
query84	255	88	89	88
query85	1043	271	291	271
query86	477	325	299	299
query87	3338	3148	3092	3092
query88	3757	2380	2352	2352
query89	481	396	384	384
query90	2007	191	193	191
query91	133	112	106	106
query92	61	48	55	48
query93	1934	530	520	520
query94	1168	201	197	197
query95	416	324	326	324
query96	582	269	264	264
query97	3143	3035	3019	3019
query98	240	225	221	221
query99	1183	843	845	843
Total cold run time: 253067 ms
Total hot run time: 168084 ms

@doris-robot
Copy link

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

query1	0.04	0.03	0.04
query2	0.08	0.03	0.04
query3	0.23	0.05	0.05
query4	1.71	0.07	0.07
query5	0.50	0.49	0.56
query6	1.13	0.72	0.72
query7	0.02	0.01	0.02
query8	0.05	0.04	0.05
query9	0.53	0.52	0.49
query10	0.56	0.55	0.54
query11	0.14	0.11	0.12
query12	0.14	0.12	0.12
query13	0.60	0.58	0.59
query14	0.80	0.78	0.78
query15	0.84	0.81	0.82
query16	0.37	0.34	0.36
query17	0.93	0.95	0.99
query18	0.24	0.23	0.25
query19	1.76	1.69	1.68
query20	0.01	0.02	0.01
query21	15.49	0.69	0.67
query22	4.11	7.59	1.97
query23	18.29	1.32	1.26
query24	2.05	0.22	0.20
query25	0.14	0.08	0.09
query26	0.27	0.16	0.17
query27	0.08	0.07	0.08
query28	13.28	1.02	1.00
query29	13.23	3.30	3.28
query30	0.26	0.06	0.05
query31	2.88	0.39	0.39
query32	3.27	0.47	0.47
query33	2.85	2.87	2.92
query34	17.06	4.47	4.43
query35	4.53	4.52	4.69
query36	0.65	0.50	0.46
query37	0.18	0.15	0.15
query38	0.16	0.16	0.16
query39	0.04	0.04	0.03
query40	0.17	0.14	0.14
query41	0.09	0.05	0.05
query42	0.06	0.05	0.05
query43	0.04	0.03	0.03
Total cold run time: 109.86 s
Total hot run time: 30.57 s

Copy link
Collaborator

@yujun777 yujun777 left a comment

Choose a reason for hiding this comment

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

need update

be/src/olap/tablet_manager.cpp Outdated Show resolved Hide resolved
be/src/olap/tablet_manager.cpp Outdated Show resolved Hide resolved
be/src/olap/tablet_manager.cpp Outdated Show resolved Hide resolved
@deardeng deardeng marked this pull request as draft May 31, 2024 01:55
Copy link
Contributor

clang-tidy review says "All clean, LGTM! 👍"

@doris-robot
Copy link

TeamCity be ut coverage result:
Function Coverage: 37.41% (9289/24828)
Line Coverage: 28.74% (76090/264717)
Region Coverage: 28.12% (39409/140142)
Branch Coverage: 24.53% (19932/81254)
Coverage Report: http://coverage.selectdb-in.cc/coverage/b88396ed331171200aafd58d3e21d6b6e24ea860_b88396ed331171200aafd58d3e21d6b6e24ea860/report/index.html

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17639	4482	4434	4434
q2	2620	200	202	200
q3	11103	1243	1167	1167
q4	10229	754	747	747
q5	7507	2733	2723	2723
q6	223	137	137	137
q7	974	621	601	601
q8	9318	2116	2092	2092
q9	9299	6440	6470	6440
q10	8907	3737	3686	3686
q11	478	248	241	241
q12	404	229	232	229
q13	17774	2997	2977	2977
q14	274	221	215	215
q15	519	480	474	474
q16	511	380	379	379
q17	955	683	700	683
q18	7989	7516	7429	7429
q19	5494	1415	1518	1415
q20	654	306	311	306
q21	5028	3069	3802	3069
q22	383	323	327	323
Total cold run time: 118282 ms
Total hot run time: 39967 ms

----- Round 2, with runtime_filter_mode=off -----
q1	4428	4374	4240	4240
q2	373	265	259	259
q3	3018	2737	2736	2736
q4	1861	1661	1590	1590
q5	5241	5294	5230	5230
q6	211	127	129	127
q7	2105	1768	1681	1681
q8	3193	3298	3293	3293
q9	8298	8273	8337	8273
q10	3869	3632	3681	3632
q11	590	485	493	485
q12	751	582	587	582
q13	16340	2959	2988	2959
q14	297	269	260	260
q15	538	468	473	468
q16	485	411	413	411
q17	1757	1484	1498	1484
q18	7685	7588	7545	7545
q19	1668	1608	1434	1434
q20	1976	1769	1774	1769
q21	9423	4779	4684	4684
q22	597	530	533	530
Total cold run time: 74704 ms
Total hot run time: 53672 ms

@doris-robot
Copy link

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

query1	948	385	367	367
query2	6470	2359	2243	2243
query3	6642	205	211	205
query4	19315	17372	17275	17275
query5	4118	451	442	442
query6	252	161	152	152
query7	4590	303	291	291
query8	320	276	287	276
query9	8452	2397	2374	2374
query10	442	308	295	295
query11	10609	10139	10124	10124
query12	140	90	88	88
query13	1651	376	373	373
query14	9605	7133	7809	7133
query15	236	183	183	183
query16	7825	272	265	265
query17	1825	529	528	528
query18	1957	268	273	268
query19	202	154	152	152
query20	92	86	90	86
query21	208	132	133	132
query22	4615	4208	4261	4208
query23	33716	33068	32752	32752
query24	11960	2795	2868	2795
query25	675	361	364	361
query26	1819	157	158	157
query27	3021	333	326	326
query28	7549	2070	2060	2060
query29	1207	618	600	600
query30	281	147	149	147
query31	968	740	722	722
query32	93	51	53	51
query33	761	282	285	282
query34	1011	494	488	488
query35	759	627	614	614
query36	1116	964	935	935
query37	277	68	69	68
query38	2867	2731	2726	2726
query39	867	803	778	778
query40	282	122	120	120
query41	53	51	51	51
query42	120	98	96	96
query43	582	554	536	536
query44	1229	753	764	753
query45	194	165	168	165
query46	1085	772	734	734
query47	1868	1774	1796	1774
query48	387	308	309	308
query49	1191	420	450	420
query50	780	393	397	393
query51	6925	6784	6788	6784
query52	105	96	91	91
query53	358	289	292	289
query54	925	449	444	444
query55	74	75	71	71
query56	274	251	255	251
query57	1136	1028	1053	1028
query58	255	238	236	236
query59	3391	3018	3043	3018
query60	294	264	298	264
query61	90	91	91	91
query62	662	444	483	444
query63	360	296	299	296
query64	9812	2201	1710	1710
query65	3143	3087	3113	3087
query66	1360	319	318	318
query67	15524	15175	14927	14927
query68	4502	547	546	546
query69	460	298	306	298
query70	1196	1153	1142	1142
query71	422	295	284	284
query72	7174	5831	5536	5536
query73	801	332	326	326
query74	5913	5522	5493	5493
query75	3417	2640	2685	2640
query76	2640	921	948	921
query77	442	300	307	300
query78	10385	9806	9807	9806
query79	2422	522	520	520
query80	1047	475	487	475
query81	543	222	218	218
query82	789	106	97	97
query83	233	170	167	167
query84	244	84	83	83
query85	2034	277	271	271
query86	481	314	297	297
query87	3281	3028	3105	3028
query88	3978	2479	2482	2479
query89	473	382	389	382
query90	1794	191	197	191
query91	135	97	96	96
query92	62	48	52	48
query93	2384	524	503	503
query94	1201	187	185	185
query95	404	315	315	315
query96	626	280	272	272
query97	3199	3046	2994	2994
query98	238	214	206	206
query99	1249	834	826	826
Total cold run time: 276089 ms
Total hot run time: 172966 ms

@doris-robot
Copy link

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

query1	0.04	0.04	0.03
query2	0.08	0.03	0.04
query3	0.23	0.05	0.04
query4	1.68	0.07	0.07
query5	0.51	0.49	0.50
query6	1.12	0.73	0.72
query7	0.02	0.01	0.01
query8	0.05	0.04	0.04
query9	0.54	0.48	0.48
query10	0.54	0.55	0.54
query11	0.15	0.11	0.11
query12	0.14	0.12	0.12
query13	0.60	0.59	0.60
query14	0.76	0.77	0.77
query15	0.81	0.82	0.82
query16	0.37	0.35	0.37
query17	0.96	0.95	0.96
query18	0.22	0.25	0.24
query19	1.79	1.69	1.68
query20	0.02	0.01	0.01
query21	15.70	0.67	0.66
query22	4.86	7.02	1.88
query23	18.27	1.32	1.33
query24	1.58	0.36	0.22
query25	0.14	0.09	0.09
query26	0.26	0.17	0.17
query27	0.07	0.07	0.08
query28	13.24	1.02	1.00
query29	12.84	3.35	3.31
query30	0.25	0.06	0.06
query31	2.86	0.38	0.39
query32	3.30	0.48	0.48
query33	2.85	2.94	2.87
query34	17.09	4.38	4.44
query35	4.47	4.54	4.59
query36	0.64	0.48	0.45
query37	0.17	0.16	0.15
query38	0.15	0.15	0.14
query39	0.04	0.03	0.03
query40	0.16	0.14	0.15
query41	0.09	0.05	0.04
query42	0.05	0.05	0.04
query43	0.04	0.04	0.04
Total cold run time: 109.75 s
Total hot run time: 30.55 s

@deardeng
Copy link
Contributor Author

deardeng commented Jun 4, 2024

run buildall

Copy link
Contributor

github-actions bot commented Jun 4, 2024

clang-tidy review says "All clean, LGTM! 👍"

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 Jun 4, 2024
Copy link
Contributor

github-actions bot commented Jun 4, 2024

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

Copy link
Collaborator

@yujun777 yujun777 left a comment

Choose a reason for hiding this comment

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

LGTM

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17624	4637	4347	4347
q2	2031	196	216	196
q3	10465	1186	1108	1108
q4	11259	918	811	811
q5	7511	2757	2694	2694
q6	226	135	132	132
q7	966	612	620	612
q8	9533	2110	2174	2110
q9	9289	6652	6663	6652
q10	9119	3755	3671	3671
q11	462	251	240	240
q12	459	232	233	232
q13	17779	2986	2965	2965
q14	281	234	226	226
q15	523	489	490	489
q16	526	388	378	378
q17	975	589	755	589
q18	8213	7518	7547	7518
q19	1775	1473	1584	1473
q20	663	306	320	306
q21	5037	3221	3987	3221
q22	395	348	342	342
Total cold run time: 115111 ms
Total hot run time: 40312 ms

----- Round 2, with runtime_filter_mode=off -----
q1	4378	4280	4261	4261
q2	366	257	273	257
q3	3010	2747	2712	2712
q4	1886	1641	1606	1606
q5	5277	5331	5283	5283
q6	214	123	127	123
q7	2144	1739	1778	1739
q8	3250	3354	3356	3354
q9	8390	8363	8385	8363
q10	3950	3649	3667	3649
q11	623	497	493	493
q12	790	592	586	586
q13	16664	2988	2985	2985
q14	276	266	274	266
q15	534	491	494	491
q16	491	418	409	409
q17	1772	1484	1484	1484
q18	7798	7573	7290	7290
q19	1685	1579	1576	1576
q20	1995	1800	1785	1785
q21	4886	4742	4701	4701
q22	622	545	531	531
Total cold run time: 71001 ms
Total hot run time: 53944 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 172807 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 07a3bc520cb15ec574034b0b9310e03fc67e094d, data reload: false

query1	944	386	371	371
query2	6465	2383	2252	2252
query3	6650	209	213	209
query4	19163	17303	17373	17303
query5	4153	443	454	443
query6	276	159	155	155
query7	4586	300	300	300
query8	308	279	283	279
query9	8595	2434	2421	2421
query10	445	301	275	275
query11	10629	10032	10091	10032
query12	145	90	90	90
query13	1633	370	376	370
query14	9553	7567	7000	7000
query15	236	197	186	186
query16	7820	282	279	279
query17	1824	546	556	546
query18	1964	288	284	284
query19	233	164	152	152
query20	95	90	89	89
query21	207	141	138	138
query22	4551	3937	3965	3937
query23	33575	32964	32994	32964
query24	12048	2843	2901	2843
query25	679	387	385	385
query26	1827	156	166	156
query27	3058	330	327	327
query28	7554	2159	2068	2068
query29	1171	611	593	593
query30	282	146	151	146
query31	965	741	727	727
query32	97	55	55	55
query33	756	277	283	277
query34	1022	479	468	468
query35	749	643	608	608
query36	1102	945	908	908
query37	288	71	72	71
query38	2884	2772	2725	2725
query39	845	785	794	785
query40	287	124	126	124
query41	55	51	51	51
query42	119	96	95	95
query43	585	556	560	556
query44	1262	713	747	713
query45	200	159	166	159
query46	1074	759	747	747
query47	1832	1775	1777	1775
query48	382	295	299	295
query49	1187	401	410	401
query50	795	405	404	404
query51	6898	6791	6746	6746
query52	111	88	95	88
query53	353	285	283	283
query54	988	478	443	443
query55	74	74	73	73
query56	282	256	261	256
query57	1203	1026	1045	1026
query58	259	259	246	246
query59	3486	3224	3249	3224
query60	300	274	273	273
query61	92	92	90	90
query62	648	449	435	435
query63	322	293	287	287
query64	9816	2218	1746	1746
query65	3193	3097	3107	3097
query66	1368	325	326	325
query67	15309	15019	14887	14887
query68	4501	539	535	535
query69	484	440	429	429
query70	1197	1136	1154	1136
query71	421	279	284	279
query72	7042	5769	5159	5159
query73	759	325	326	325
query74	5919	5546	5589	5546
query75	3452	2646	2669	2646
query76	2901	908	931	908
query77	491	291	282	282
query78	10477	9887	9768	9768
query79	2335	514	514	514
query80	2451	474	466	466
query81	561	219	217	217
query82	888	106	101	101
query83	321	171	175	171
query84	271	85	94	85
query85	2203	275	273	273
query86	512	313	312	312
query87	3266	3084	3065	3065
query88	3994	2460	2438	2438
query89	479	393	382	382
query90	1831	199	199	199
query91	128	103	99	99
query92	70	50	50	50
query93	2376	524	501	501
query94	1266	189	188	188
query95	409	326	322	322
query96	612	270	275	270
query97	3201	2989	3046	2989
query98	250	229	237	229
query99	1262	861	863	861
Total cold run time: 278187 ms
Total hot run time: 172807 ms

@doris-robot
Copy link

TeamCity be ut coverage result:
Function Coverage: 36.41% (8985/24680)
Line Coverage: 27.91% (73377/262870)
Region Coverage: 27.36% (38003/138922)
Branch Coverage: 23.94% (19286/80546)
Coverage Report: http://coverage.selectdb-in.cc/coverage/07a3bc520cb15ec574034b0b9310e03fc67e094d_07a3bc520cb15ec574034b0b9310e03fc67e094d/report/index.html

@doris-robot
Copy link

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

query1	0.04	0.02	0.04
query2	0.08	0.04	0.04
query3	0.24	0.06	0.05
query4	1.66	0.08	0.09
query5	0.51	0.49	0.51
query6	1.12	0.72	0.73
query7	0.02	0.01	0.01
query8	0.05	0.04	0.05
query9	0.55	0.49	0.49
query10	0.56	0.56	0.54
query11	0.16	0.11	0.11
query12	0.15	0.12	0.12
query13	0.59	0.59	0.60
query14	0.79	0.80	0.78
query15	0.84	0.82	0.81
query16	0.37	0.36	0.37
query17	0.99	1.04	0.99
query18	0.22	0.23	0.24
query19	1.91	1.82	1.78
query20	0.01	0.01	0.02
query21	15.70	0.65	0.66
query22	4.12	6.96	2.23
query23	18.31	1.39	1.36
query24	1.48	0.30	0.27
query25	0.15	0.09	0.08
query26	0.27	0.17	0.18
query27	0.08	0.08	0.08
query28	13.38	1.01	1.01
query29	13.24	3.31	3.30
query30	0.25	0.06	0.06
query31	2.86	0.38	0.39
query32	3.27	0.48	0.47
query33	2.88	2.90	2.94
query34	17.02	4.37	4.41
query35	4.46	4.45	4.54
query36	0.65	0.49	0.48
query37	0.19	0.16	0.17
query38	0.17	0.16	0.16
query39	0.05	0.04	0.04
query40	0.17	0.15	0.15
query41	0.09	0.05	0.05
query42	0.05	0.04	0.05
query43	0.04	0.04	0.04
Total cold run time: 109.74 s
Total hot run time: 31.16 s

@dataroaring dataroaring merged commit 5cb5df3 into apache:master Jun 5, 2024
26 of 29 checks passed
dataroaring pushed a commit that referenced this pull request Jun 7, 2024
The entire process is as follows:
1. Drop the tablet.
2. Successfully clone the tablet in full.
3. Start the incremental clone.
4. Start to move the tablet to the trash (the process of actually
cleaning the data begins from step 1, where the tablet was dropped).
5. The incremental clone fails.
6. The incremental clone is successfully retried.

Step 4 moved the data that was just pulled from the full clone to the
trash, leading to data loss.
The failure in step 5 of the incremental clone was also due to the
deletion of the just-pulled snapshot data.

Fix:
When cloning, check the tablet status and determine if the tablet
directory has already been moved to the trash directory. If it has not
been moved to the trash, the clone thread should help move it to the
trash directory.
deardeng added a commit to deardeng/incubator-doris that referenced this pull request Jun 25, 2024
…34889)

The entire process is as follows:
1. Drop the tablet.
2. Successfully clone the tablet in full.
3. Start the incremental clone.
4. Start to move the tablet to the trash (the process of actually
cleaning the data begins from step 1, where the tablet was dropped).
5. The incremental clone fails.
6. The incremental clone is successfully retried.

Step 4 moved the data that was just pulled from the full clone to the
trash, leading to data loss.
The failure in step 5 of the incremental clone was also due to the
deletion of the just-pulled snapshot data.

Fix:
When cloning, check the tablet status and determine if the tablet
directory has already been moved to the trash directory. If it has not
been moved to the trash, the clone thread should help move it to the
trash directory.
deardeng added a commit to deardeng/incubator-doris that referenced this pull request Jun 26, 2024
…34889)

The entire process is as follows:
1. Drop the tablet.
2. Successfully clone the tablet in full.
3. Start the incremental clone.
4. Start to move the tablet to the trash (the process of actually
cleaning the data begins from step 1, where the tablet was dropped).
5. The incremental clone fails.
6. The incremental clone is successfully retried.

Step 4 moved the data that was just pulled from the full clone to the
trash, leading to data loss.
The failure in step 5 of the incremental clone was also due to the
deletion of the just-pulled snapshot data.

Fix:
When cloning, check the tablet status and determine if the tablet
directory has already been moved to the trash directory. If it has not
been moved to the trash, the clone thread should help move it to the
trash directory.
deardeng added a commit to deardeng/incubator-doris that referenced this pull request Jun 28, 2024
…34889)

The entire process is as follows:
1. Drop the tablet.
2. Successfully clone the tablet in full.
3. Start the incremental clone.
4. Start to move the tablet to the trash (the process of actually
cleaning the data begins from step 1, where the tablet was dropped).
5. The incremental clone fails.
6. The incremental clone is successfully retried.

Step 4 moved the data that was just pulled from the full clone to the
trash, leading to data loss.
The failure in step 5 of the incremental clone was also due to the
deletion of the just-pulled snapshot data.

Fix:
When cloning, check the tablet status and determine if the tablet
directory has already been moved to the trash directory. If it has not
been moved to the trash, the clone thread should help move it to the
trash directory.
mongo360 pushed a commit to mongo360/doris that referenced this pull request Aug 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants