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](vault) Fix bugs about altering storage vault name #45685

Merged
merged 2 commits into from
Dec 25, 2024

Conversation

SWJTU-ZhangLei
Copy link
Contributor

@SWJTU-ZhangLei SWJTU-ZhangLei commented Dec 20, 2024

  • fix altering storage name but not writing disk in meta-service
  • check vault if existed when altering stoarge vault name

What problem does this PR solve?

Issue Number: close #xxx

Related PR: #xxx

Problem Summary:

Release note

None

Check List (For Author)

  • Test

    • Regression test
    • Unit Test
    • Manual test (add detailed scripts or steps below)
    • No need to test or manual test. Explain why:
      • This is a refactor/code format and no logic has been changed.
      • Previous test can cover this change.
      • No code files have been changed.
      • Other reason
  • Behavior changed:

    • No.
    • Yes.
  • Does this need documentation?

    • No.
    • Yes.

Check List (For Reviewer who merge this PR)

  • Confirm the release note
  • Confirm test cases
  • Confirm document
  • Add branch pick label

@hello-stephen
Copy link
Contributor

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?

@SWJTU-ZhangLei
Copy link
Contributor Author

run buildall

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

return 0;
}

static int alter_s3_storage_vault(InstanceInfoPB& instance, std::unique_ptr<Transaction> txn,
static int alter_s3_storage_vault(InstanceInfoPB& instance, std::unique_ptr<Transaction>& txn,
Copy link
Contributor

Choose a reason for hiding this comment

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

warning: function 'alter_s3_storage_vault' exceeds recommended size/complexity thresholds [readability-function-size]

static int alter_s3_storage_vault(InstanceInfoPB& instance, std::unique_ptr<Transaction>& txn,
           ^
Additional context

cloud/src/meta-service/meta_service_resource.cpp:654: 130 lines including whitespace and comments (threshold 80)

static int alter_s3_storage_vault(InstanceInfoPB& instance, std::unique_ptr<Transaction>& txn,
           ^

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17682	7550	7265	7265
q2	2051	188	174	174
q3	10622	1094	1218	1094
q4	10590	745	806	745
q5	7623	2764	2650	2650
q6	241	150	146	146
q7	984	615	591	591
q8	9234	1900	1961	1900
q9	6639	6467	6430	6430
q10	6994	2321	2321	2321
q11	463	287	263	263
q12	436	226	228	226
q13	17793	2968	3022	2968
q14	246	210	212	210
q15	589	520	508	508
q16	697	598	586	586
q17	975	547	542	542
q18	7407	6803	6610	6610
q19	1362	1032	1003	1003
q20	476	184	186	184
q21	4055	3253	3172	3172
q22	383	317	309	309
Total cold run time: 107542 ms
Total hot run time: 39897 ms

----- Round 2, with runtime_filter_mode=off -----
q1	7259	7224	7235	7224
q2	330	220	228	220
q3	2896	2825	2994	2825
q4	2060	1840	1846	1840
q5	5680	5680	5680	5680
q6	225	149	150	149
q7	2221	1843	1869	1843
q8	3384	3545	3586	3545
q9	8908	9098	9046	9046
q10	3585	3550	3565	3550
q11	586	514	506	506
q12	830	614	623	614
q13	14224	3182	3085	3085
q14	326	274	283	274
q15	577	492	500	492
q16	703	641	656	641
q17	1856	1638	1631	1631
q18	8238	7736	7668	7668
q19	1714	1591	1466	1466
q20	2108	1890	1848	1848
q21	5783	5484	5387	5387
q22	657	582	587	582
Total cold run time: 74150 ms
Total hot run time: 60116 ms

@doris-robot
Copy link

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

query1	1290	967	902	902
query2	6238	2366	2361	2361
query3	11091	4910	4877	4877
query4	33473	23422	23604	23422
query5	5096	469	452	452
query6	284	198	195	195
query7	3996	315	319	315
query8	318	285	254	254
query9	9536	2694	2707	2694
query10	520	261	250	250
query11	18158	15225	15300	15225
query12	162	109	105	105
query13	1670	423	420	420
query14	11548	7280	7493	7280
query15	286	188	191	188
query16	8144	496	458	458
query17	1736	627	618	618
query18	2204	352	299	299
query19	379	162	166	162
query20	127	120	110	110
query21	217	107	112	107
query22	4798	4507	4418	4418
query23	39299	34386	33604	33604
query24	10599	2573	2483	2483
query25	515	395	389	389
query26	740	161	151	151
query27	2651	325	347	325
query28	7636	2461	2480	2461
query29	682	420	411	411
query30	234	168	150	150
query31	1046	835	812	812
query32	95	57	60	57
query33	787	297	314	297
query34	1045	529	517	517
query35	866	796	770	770
query36	1124	949	948	948
query37	124	72	85	72
query38	4216	4212	4225	4212
query39	1534	1456	1434	1434
query40	207	125	102	102
query41	45	50	44	44
query42	122	104	106	104
query43	534	515	500	500
query44	1316	845	841	841
query45	199	167	172	167
query46	1205	709	738	709
query47	2052	1922	1893	1893
query48	423	343	326	326
query49	943	394	418	394
query50	826	394	399	394
query51	7274	7076	7183	7076
query52	110	96	90	90
query53	270	192	197	192
query54	1077	408	438	408
query55	80	80	81	80
query56	284	276	269	269
query57	1279	1173	1181	1173
query58	247	216	239	216
query59	3334	3268	3200	3200
query60	281	253	252	252
query61	106	107	113	107
query62	839	692	701	692
query63	222	194	201	194
query64	3883	745	681	681
query65	3341	3264	3261	3261
query66	681	302	307	302
query67	16502	15606	15472	15472
query68	6750	555	535	535
query69	486	255	255	255
query70	1256	1131	1147	1131
query71	524	274	257	257
query72	6758	4071	4127	4071
query73	800	357	365	357
query74	9963	8888	8855	8855
query75	4156	2686	2637	2637
query76	4616	1205	1105	1105
query77	812	287	287	287
query78	10320	9406	9297	9297
query79	1887	608	600	600
query80	872	431	419	419
query81	527	236	234	234
query82	702	119	118	118
query83	239	146	144	144
query84	265	71	72	71
query85	1234	306	294	294
query86	406	307	301	301
query87	4539	4403	4326	4326
query88	3858	2203	2184	2184
query89	440	293	290	290
query90	1977	188	190	188
query91	143	100	105	100
query92	60	53	58	53
query93	2521	556	538	538
query94	663	300	364	300
query95	346	252	246	246
query96	630	284	275	275
query97	2846	2673	2633	2633
query98	217	192	196	192
query99	1654	1330	1331	1330
Total cold run time: 314613 ms
Total hot run time: 196967 ms

@doris-robot
Copy link

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

query1	0.03	0.02	0.03
query2	0.10	0.04	0.05
query3	0.23	0.06	0.05
query4	1.64	0.08	0.08
query5	0.41	0.41	0.41
query6	1.14	0.66	0.65
query7	0.02	0.01	0.03
query8	0.05	0.05	0.04
query9	0.56	0.49	0.50
query10	0.57	0.59	0.55
query11	0.16	0.12	0.13
query12	0.17	0.13	0.12
query13	0.61	0.60	0.60
query14	2.74	2.73	2.77
query15	0.91	0.84	0.83
query16	0.37	0.38	0.37
query17	1.08	1.07	1.06
query18	0.19	0.19	0.19
query19	2.00	1.88	2.07
query20	0.01	0.01	0.01
query21	15.36	0.65	0.64
query22	4.27	7.61	1.98
query23	18.29	1.46	1.39
query24	2.21	0.21	0.21
query25	0.15	0.09	0.08
query26	0.27	0.19	0.17
query27	0.08	0.08	0.08
query28	13.35	1.16	1.17
query29	12.64	3.38	3.38
query30	0.25	0.07	0.07
query31	2.82	0.41	0.41
query32	3.24	0.48	0.48
query33	3.15	3.11	3.07
query34	16.86	4.54	4.51
query35	4.60	4.56	4.55
query36	0.67	0.50	0.48
query37	0.20	0.16	0.16
query38	0.16	0.15	0.15
query39	0.06	0.04	0.04
query40	0.17	0.13	0.13
query41	0.10	0.05	0.05
query42	0.06	0.05	0.05
query43	0.06	0.05	0.04
Total cold run time: 112.01 s
Total hot run time: 33.53 s

@SWJTU-ZhangLei SWJTU-ZhangLei force-pushed the master-vault branch 2 times, most recently from d5cd146 to 200e666 Compare December 23, 2024 02:01
@SWJTU-ZhangLei SWJTU-ZhangLei marked this pull request as ready for review December 23, 2024 02:01
@SWJTU-ZhangLei
Copy link
Contributor Author

run buildall

@SWJTU-ZhangLei
Copy link
Contributor Author

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17607	7441	7245	7245
q2	2064	179	163	163
q3	10647	1091	1230	1091
q4	10569	741	728	728
q5	7619	2763	2722	2722
q6	238	149	149	149
q7	1006	631	603	603
q8	9242	1933	1935	1933
q9	6615	6463	6460	6460
q10	7005	2308	2398	2308
q11	470	270	259	259
q12	422	223	225	223
q13	17772	2932	2937	2932
q14	250	223	218	218
q15	556	504	498	498
q16	668	571	594	571
q17	992	564	540	540
q18	7194	6592	6690	6592
q19	1342	1006	925	925
q20	477	183	182	182
q21	4024	3109	3115	3109
q22	388	316	307	307
Total cold run time: 107167 ms
Total hot run time: 39758 ms

----- Round 2, with runtime_filter_mode=off -----
q1	7226	7199	7188	7188
q2	329	226	236	226
q3	2963	2840	2972	2840
q4	2093	1884	1836	1836
q5	5718	5659	5692	5659
q6	225	142	143	142
q7	2262	1793	1797	1793
q8	3380	3572	3562	3562
q9	9017	8960	9017	8960
q10	3579	3579	3597	3579
q11	615	538	561	538
q12	859	627	611	611
q13	13816	3146	3104	3104
q14	304	277	289	277
q15	579	511	515	511
q16	690	661	634	634
q17	1857	1641	1618	1618
q18	8475	7739	7833	7739
q19	2006	1610	1446	1446
q20	2117	1866	1858	1858
q21	5685	5668	5544	5544
q22	648	594	619	594
Total cold run time: 74443 ms
Total hot run time: 60259 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 195955 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 1dcce20c29f1ab65a20f00971985d4b1e90dabd7, data reload: false

query1	1326	993	895	895
query2	6238	2460	2459	2459
query3	11127	4757	4786	4757
query4	33224	23309	23387	23309
query5	4126	470	467	467
query6	298	194	204	194
query7	3985	294	301	294
query8	298	250	225	225
query9	9510	2683	2672	2672
query10	484	242	245	242
query11	17858	15039	15105	15039
query12	155	105	100	100
query13	1573	425	435	425
query14	10226	6876	6769	6769
query15	251	200	200	200
query16	7943	449	435	435
query17	1566	615	563	563
query18	1878	308	318	308
query19	272	158	150	150
query20	116	112	126	112
query21	212	105	110	105
query22	4935	4718	4472	4472
query23	34564	33885	33818	33818
query24	10480	2484	2481	2481
query25	631	388	396	388
query26	1418	148	152	148
query27	2844	336	348	336
query28	7881	2495	2470	2470
query29	878	415	417	415
query30	222	156	156	156
query31	1023	844	870	844
query32	104	55	60	55
query33	781	284	297	284
query34	986	528	509	509
query35	875	754	760	754
query36	1120	956	977	956
query37	148	72	77	72
query38	4322	4247	4053	4053
query39	1535	1446	1487	1446
query40	286	102	100	100
query41	46	45	44	44
query42	123	102	98	98
query43	560	503	523	503
query44	1338	844	851	844
query45	191	174	165	165
query46	1194	723	708	708
query47	1991	1936	1920	1920
query48	447	341	330	330
query49	1027	418	382	382
query50	857	395	381	381
query51	7403	7250	7189	7189
query52	103	94	96	94
query53	262	193	182	182
query54	1077	432	441	432
query55	84	81	84	81
query56	277	270	257	257
query57	1285	1169	1171	1169
query58	233	225	234	225
query59	3558	3326	3117	3117
query60	275	246	263	246
query61	108	121	109	109
query62	893	667	663	663
query63	211	188	183	183
query64	4031	667	638	638
query65	3243	3193	3204	3193
query66	888	329	303	303
query67	15710	15666	15537	15537
query68	4786	569	563	563
query69	455	271	272	271
query70	1206	1198	1119	1119
query71	380	251	259	251
query72	6458	4124	4139	4124
query73	775	360	359	359
query74	9808	8754	8993	8754
query75	3399	2625	2666	2625
query76	2848	981	1030	981
query77	366	273	260	260
query78	10304	9526	9386	9386
query79	2282	594	602	594
query80	922	420	434	420
query81	541	241	233	233
query82	831	118	129	118
query83	266	141	146	141
query84	232	70	75	70
query85	1303	311	301	301
query86	418	301	301	301
query87	4653	4347	4375	4347
query88	3909	2201	2173	2173
query89	429	294	283	283
query90	2036	181	185	181
query91	141	105	105	105
query92	67	51	49	49
query93	2362	563	545	545
query94	932	291	288	288
query95	364	242	249	242
query96	618	277	283	277
query97	2774	2628	2711	2628
query98	220	193	202	193
query99	1551	1376	1303	1303
Total cold run time: 302750 ms
Total hot run time: 195955 ms

@doris-robot
Copy link

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

query1	0.03	0.03	0.03
query2	0.09	0.04	0.04
query3	0.23	0.05	0.06
query4	1.63	0.08	0.07
query5	0.42	0.41	0.41
query6	1.15	0.65	0.67
query7	0.02	0.01	0.01
query8	0.06	0.05	0.05
query9	0.54	0.49	0.49
query10	0.56	0.59	0.53
query11	0.16	0.11	0.12
query12	0.15	0.13	0.13
query13	0.61	0.60	0.60
query14	2.78	2.75	2.77
query15	0.90	0.84	0.84
query16	0.38	0.37	0.37
query17	1.08	1.04	0.99
query18	0.19	0.19	0.20
query19	1.93	1.98	1.77
query20	0.02	0.01	0.02
query21	15.36	0.66	0.65
query22	4.22	5.83	2.50
query23	18.30	1.33	1.28
query24	2.14	0.23	0.22
query25	0.15	0.10	0.09
query26	0.26	0.18	0.18
query27	0.08	0.08	0.07
query28	13.32	1.17	1.15
query29	12.61	3.38	3.38
query30	0.24	0.07	0.07
query31	2.86	0.41	0.39
query32	3.23	0.49	0.48
query33	3.02	3.18	3.12
query34	16.82	4.50	4.51
query35	4.56	4.53	4.59
query36	0.67	0.48	0.47
query37	0.19	0.16	0.16
query38	0.15	0.15	0.16
query39	0.06	0.05	0.04
query40	0.16	0.13	0.14
query41	0.11	0.05	0.05
query42	0.06	0.05	0.05
query43	0.05	0.04	0.05
Total cold run time: 111.55 s
Total hot run time: 33.79 s

@SWJTU-ZhangLei
Copy link
Contributor Author

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17645	7456	7286	7286
q2	2073	182	168	168
q3	10624	1113	1152	1113
q4	10451	797	721	721
q5	7613	2816	2778	2778
q6	243	153	151	151
q7	986	640	612	612
q8	9263	1893	1987	1893
q9	6777	6475	6503	6475
q10	7058	2333	2370	2333
q11	478	263	260	260
q12	446	231	236	231
q13	17787	3015	3011	3011
q14	251	218	205	205
q15	569	518	490	490
q16	663	598	601	598
q17	1024	558	504	504
q18	7295	6764	6553	6553
q19	1439	1049	994	994
q20	474	185	203	185
q21	4083	3360	3390	3360
q22	386	322	328	322
Total cold run time: 107628 ms
Total hot run time: 40243 ms

----- Round 2, with runtime_filter_mode=off -----
q1	7268	7253	7226	7226
q2	325	235	240	235
q3	2971	2929	2942	2929
q4	2141	1834	1833	1833
q5	5661	5699	5714	5699
q6	228	144	142	142
q7	2247	1807	1755	1755
q8	3426	3598	3551	3551
q9	8971	9001	9083	9001
q10	3596	3558	3594	3558
q11	601	509	515	509
q12	821	616	593	593
q13	14201	3247	3126	3126
q14	330	275	287	275
q15	565	504	506	504
q16	680	665	662	662
q17	1902	1603	1657	1603
q18	8433	7807	7682	7682
q19	1752	1538	1607	1538
q20	2129	1883	1883	1883
q21	5624	5505	5454	5454
q22	681	590	607	590
Total cold run time: 74553 ms
Total hot run time: 60348 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 196911 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 49f85f951532e6f41a17edb2f5b714543fe3a051, data reload: false

query1	1321	1004	927	927
query2	6269	2299	2371	2299
query3	11078	4749	4790	4749
query4	32975	23421	23484	23421
query5	4186	475	470	470
query6	299	190	194	190
query7	4003	305	304	304
query8	292	242	234	234
query9	9679	2780	2776	2776
query10	477	257	243	243
query11	18258	15164	15181	15164
query12	154	110	108	108
query13	1588	433	443	433
query14	10378	7858	7009	7009
query15	327	189	200	189
query16	8299	492	449	449
query17	1782	625	595	595
query18	2152	315	335	315
query19	375	174	172	172
query20	129	116	117	116
query21	216	118	116	116
query22	4935	4357	4531	4357
query23	35078	34747	33722	33722
query24	10464	2519	2604	2519
query25	622	411	407	407
query26	1371	165	154	154
query27	2834	338	345	338
query28	7501	2504	2528	2504
query29	840	422	434	422
query30	233	150	150	150
query31	1050	845	832	832
query32	98	59	60	59
query33	762	313	293	293
query34	1153	532	550	532
query35	867	783	794	783
query36	1115	978	982	978
query37	144	83	77	77
query38	4367	4313	4158	4158
query39	1527	1471	1474	1471
query40	206	104	104	104
query41	45	44	43	43
query42	142	107	107	107
query43	547	511	505	505
query44	1346	849	825	825
query45	185	172	170	170
query46	1216	740	730	730
query47	2037	1914	1956	1914
query48	413	332	331	331
query49	892	398	409	398
query50	844	421	403	403
query51	7333	7163	7222	7163
query52	107	92	87	87
query53	272	189	193	189
query54	1013	433	435	433
query55	81	81	84	81
query56	283	267	236	236
query57	1320	1160	1161	1160
query58	243	219	235	219
query59	3419	3237	3128	3128
query60	274	258	272	258
query61	112	106	103	103
query62	849	698	713	698
query63	222	200	202	200
query64	3976	694	656	656
query65	3332	3272	3321	3272
query66	705	297	326	297
query67	16465	15434	15547	15434
query68	5484	558	565	558
query69	503	256	256	256
query70	1223	1141	1152	1141
query71	509	259	257	257
query72	7059	4137	4066	4066
query73	857	454	366	366
query74	10082	8854	8851	8851
query75	4001	2613	2659	2613
query76	3739	1059	1033	1033
query77	674	291	278	278
query78	10230	9420	9390	9390
query79	1972	597	620	597
query80	1229	424	437	424
query81	508	236	238	236
query82	580	121	121	121
query83	202	156	145	145
query84	287	70	68	68
query85	1259	308	304	304
query86	364	301	293	293
query87	4465	4332	4626	4332
query88	3730	2233	2212	2212
query89	443	289	289	289
query90	2172	193	192	192
query91	145	105	107	105
query92	69	51	52	51
query93	3071	566	570	566
query94	763	293	293	293
query95	360	252	267	252
query96	660	277	284	277
query97	2885	2704	2661	2661
query98	218	196	199	196
query99	1664	1334	1309	1309
Total cold run time: 308484 ms
Total hot run time: 196911 ms

@SWJTU-ZhangLei
Copy link
Contributor Author

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	18064	8181	7305	7305
q2	2044	186	183	183
q3	10666	1127	1176	1127
q4	10437	725	770	725
q5	7584	2733	2635	2635
q6	240	148	146	146
q7	987	625	608	608
q8	9261	1865	1915	1865
q9	6592	6416	6469	6416
q10	6996	2341	2359	2341
q11	470	264	253	253
q12	410	225	224	224
q13	17778	2884	2913	2884
q14	244	223	211	211
q15	575	490	499	490
q16	687	582	599	582
q17	976	559	609	559
q18	7260	6838	6747	6747
q19	1347	907	932	907
q20	470	182	199	182
q21	3986	3149	3255	3149
q22	378	313	318	313
Total cold run time: 107452 ms
Total hot run time: 39852 ms

----- Round 2, with runtime_filter_mode=off -----
q1	7258	7295	7250	7250
q2	327	228	232	228
q3	2902	2887	2980	2887
q4	2091	1833	1752	1752
q5	5580	5606	5641	5606
q6	227	139	139	139
q7	2169	1758	1760	1758
q8	3346	3512	3482	3482
q9	9008	8829	8874	8829
q10	3550	3547	3539	3539
q11	605	498	502	498
q12	809	629	625	625
q13	12842	3084	3081	3081
q14	306	271	264	264
q15	549	504	527	504
q16	678	647	638	638
q17	1812	1574	1543	1543
q18	7950	7522	7369	7369
q19	1703	1543	1540	1540
q20	2043	1835	1829	1829
q21	5334	5246	5349	5246
q22	671	596	583	583
Total cold run time: 71760 ms
Total hot run time: 59190 ms

@doris-robot
Copy link

TPC-DS: Total hot run time: 189786 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 70c82aaac9300f32786982540f9d276c82924baf, data reload: false

query1	976	407	390	390
query2	6637	2364	2356	2356
query3	6711	211	204	204
query4	33956	23324	23370	23324
query5	4293	471	460	460
query6	288	205	185	185
query7	4625	304	308	304
query8	316	246	232	232
query9	9472	2766	2729	2729
query10	470	243	262	243
query11	18098	15119	15258	15119
query12	162	103	108	103
query13	1669	463	432	432
query14	10056	7466	6766	6766
query15	322	192	185	185
query16	8439	428	429	428
query17	1782	589	580	580
query18	2152	305	345	305
query19	383	145	151	145
query20	118	107	110	107
query21	210	105	100	100
query22	4613	4503	4324	4324
query23	34532	33704	33413	33413
query24	11398	2586	2406	2406
query25	662	378	393	378
query26	1826	153	151	151
query27	2895	329	322	322
query28	8072	2461	2476	2461
query29	1040	400	409	400
query30	298	150	149	149
query31	1030	829	787	787
query32	100	65	58	58
query33	772	293	322	293
query34	984	511	519	511
query35	865	735	737	735
query36	1081	903	949	903
query37	279	75	76	75
query38	4199	4371	4212	4212
query39	1501	1434	1419	1419
query40	278	102	102	102
query41	47	44	48	44
query42	111	97	99	97
query43	534	489	500	489
query44	1338	811	798	798
query45	185	168	163	163
query46	1164	707	719	707
query47	1933	1886	1859	1859
query48	412	323	338	323
query49	1298	397	405	397
query50	796	388	379	379
query51	7247	7027	6915	6915
query52	106	89	92	89
query53	255	184	192	184
query54	1285	404	415	404
query55	84	77	76	76
query56	271	249	266	249
query57	1270	1108	1113	1108
query58	232	218	240	218
query59	3370	3006	3096	3006
query60	277	242	241	241
query61	112	107	109	107
query62	884	692	665	665
query63	211	186	185	185
query64	5090	726	659	659
query65	3268	3196	3259	3196
query66	1438	308	313	308
query67	15722	15571	15608	15571
query68	5804	543	552	543
query69	433	246	263	246
query70	1242	1065	1084	1065
query71	458	247	257	247
query72	6608	4138	3881	3881
query73	785	354	358	354
query74	10398	8923	8762	8762
query75	3468	2629	2618	2618
query76	3598	1078	1112	1078
query77	546	270	280	270
query78	10335	9662	9479	9479
query79	1691	608	609	608
query80	1039	421	425	421
query81	526	231	232	231
query82	793	118	121	118
query83	244	152	145	145
query84	244	67	74	67
query85	1406	313	305	305
query86	510	306	298	298
query87	4455	4382	4442	4382
query88	3421	2240	2219	2219
query89	405	294	299	294
query90	2133	185	185	185
query91	138	109	107	107
query92	71	52	51	51
query93	1426	562	565	562
query94	1149	285	282	282
query95	353	252	259	252
query96	610	290	287	287
query97	2869	2679	2686	2679
query98	222	205	196	196
query99	1540	1351	1321	1321
Total cold run time: 305420 ms
Total hot run time: 189786 ms

@doris-robot
Copy link

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

query1	0.03	0.03	0.03
query2	0.08	0.02	0.04
query3	0.23	0.08	0.07
query4	1.61	0.11	0.10
query5	0.42	0.40	0.41
query6	1.17	0.65	0.65
query7	0.02	0.02	0.02
query8	0.04	0.03	0.03
query9	0.58	0.52	0.49
query10	0.56	0.55	0.55
query11	0.13	0.11	0.11
query12	0.14	0.12	0.11
query13	0.62	0.59	0.60
query14	2.74	2.73	2.73
query15	0.88	0.82	0.83
query16	0.38	0.38	0.40
query17	1.04	1.05	1.05
query18	0.23	0.21	0.21
query19	1.84	1.74	2.03
query20	0.01	0.01	0.02
query21	15.36	0.60	0.58
query22	2.78	2.39	1.83
query23	17.06	0.87	0.88
query24	3.33	1.19	0.80
query25	0.23	0.14	0.12
query26	0.61	0.14	0.15
query27	0.08	0.04	0.04
query28	10.59	1.10	1.08
query29	12.63	3.27	3.17
query30	0.25	0.06	0.06
query31	2.86	0.38	0.38
query32	3.26	0.48	0.46
query33	3.07	3.05	3.16
query34	17.29	4.43	4.49
query35	4.50	4.52	4.51
query36	0.66	0.51	0.48
query37	0.09	0.06	0.06
query38	0.05	0.04	0.04
query39	0.04	0.02	0.02
query40	0.16	0.12	0.12
query41	0.08	0.03	0.03
query42	0.03	0.03	0.02
query43	0.04	0.03	0.03
Total cold run time: 107.8 s
Total hot run time: 32.43 s

@@ -887,6 +887,9 @@ message AlterObjStoreInfoResponse {
optional MetaServiceResponseStatus status = 1;
optional string storage_vault_id = 2;
optional bool default_storage_vault_replaced = 3;

// storage_vault_name maybe changed, so return new storage_vault_name
optional string storage_vault_name = 4;
Copy link
Contributor

Choose a reason for hiding this comment

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

redundant vault name, using the name in request

Copy link
Contributor Author

Choose a reason for hiding this comment

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

redundant vault name, using the name in request

done

return false;
}

static int alter_hdfs_storage_vault(InstanceInfoPB& instance, std::unique_ptr<Transaction>& txn,
Copy link
Contributor

Choose a reason for hiding this comment

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

add UT

Copy link
Contributor Author

Choose a reason for hiding this comment

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

add UT

done

* fix altering storage name but not writing disk in meta-service
* check vault if existed when altering stoarge vault name
@SWJTU-ZhangLei
Copy link
Contributor Author

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17654	6086	5967	5967
q2	2044	297	165	165
q3	10431	1214	707	707
q4	10206	857	420	420
q5	7519	2185	1952	1952
q6	207	179	144	144
q7	884	754	595	595
q8	9242	1329	1141	1141
q9	5242	4895	4922	4895
q10	6740	2341	1852	1852
q11	482	271	260	260
q12	362	356	221	221
q13	17771	3556	3042	3042
q14	235	232	212	212
q15	571	504	510	504
q16	651	622	580	580
q17	565	859	321	321
q18	6994	6406	6502	6406
q19	1843	976	572	572
q20	303	314	185	185
q21	2831	2347	1959	1959
q22	356	336	308	308
Total cold run time: 103133 ms
Total hot run time: 32408 ms

----- Round 2, with runtime_filter_mode=off -----
q1	6362	6297	6272	6272
q2	231	325	230	230
q3	2271	2658	2299	2299
q4	1403	1827	1325	1325
q5	4358	4769	4803	4769
q6	186	178	143	143
q7	2060	1913	1815	1815
q8	2629	2836	2683	2683
q9	7434	7452	7710	7452
q10	3176	3437	2929	2929
q11	587	545	496	496
q12	657	785	668	668
q13	3575	4015	3382	3382
q14	319	323	280	280
q15	576	516	500	500
q16	685	696	646	646
q17	1227	1767	1279	1279
q18	7819	7405	7438	7405
q19	853	1160	1100	1100
q20	2045	2047	1910	1910
q21	5877	5447	4957	4957
q22	592	613	550	550
Total cold run time: 54922 ms
Total hot run time: 53090 ms

@doris-robot
Copy link

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

query1	1278	1002	923	923
query2	6402	2502	2354	2354
query3	11005	4719	4660	4660
query4	33380	23864	23829	23829
query5	5240	624	468	468
query6	288	197	198	197
query7	3982	485	302	302
query8	295	259	251	251
query9	9497	2704	2704	2704
query10	515	304	244	244
query11	18217	15247	15420	15247
query12	160	114	99	99
query13	1634	543	390	390
query14	10267	6735	6938	6735
query15	245	209	196	196
query16	7926	598	464	464
query17	1470	754	555	555
query18	2045	417	329	329
query19	193	194	156	156
query20	127	117	113	113
query21	208	130	117	117
query22	4525	4611	4489	4489
query23	34770	33477	33891	33477
query24	7562	2304	2349	2304
query25	454	442	387	387
query26	698	258	152	152
query27	2664	473	324	324
query28	5548	2475	2482	2475
query29	564	547	423	423
query30	212	225	153	153
query31	969	934	857	857
query32	79	59	56	56
query33	480	347	302	302
query34	749	844	540	540
query35	818	841	764	764
query36	1036	1053	978	978
query37	121	97	75	75
query38	4179	4331	4134	4134
query39	1516	1471	1467	1467
query40	200	117	101	101
query41	48	43	43	43
query42	114	102	101	101
query43	537	554	485	485
query44	1373	817	832	817
query45	179	179	175	175
query46	887	1069	654	654
query47	2026	2006	1971	1971
query48	398	412	336	336
query49	702	480	395	395
query50	645	655	387	387
query51	7294	7261	7151	7151
query52	102	102	96	96
query53	238	266	190	190
query54	481	517	435	435
query55	82	83	84	83
query56	278	288	259	259
query57	1224	1283	1118	1118
query58	227	224	231	224
query59	3225	3391	3133	3133
query60	269	265	254	254
query61	112	112	108	108
query62	836	822	749	749
query63	232	200	191	191
query64	2878	1026	649	649
query65	3292	3263	3277	3263
query66	813	421	326	326
query67	16233	15909	15498	15498
query68	9984	759	516	516
query69	490	295	256	256
query70	1178	1157	1093	1093
query71	459	335	252	252
query72	5853	3891	3759	3759
query73	833	762	360	360
query74	10159	9074	8834	8834
query75	4723	3158	2742	2742
query76	5607	1190	771	771
query77	1031	364	281	281
query78	10172	10235	9341	9341
query79	3246	908	600	600
query80	698	517	478	478
query81	487	265	228	228
query82	232	154	127	127
query83	187	160	142	142
query84	283	99	83	83
query85	751	356	293	293
query86	354	326	308	308
query87	4543	4363	4549	4363
query88	3558	2220	2216	2216
query89	443	345	295	295
query90	2054	186	187	186
query91	138	136	106	106
query92	69	58	52	52
query93	2387	896	537	537
query94	704	402	246	246
query95	331	268	252	252
query96	483	612	283	283
query97	2758	2832	2712	2712
query98	220	207	189	189
query99	1668	1567	1427	1427
Total cold run time: 302326 ms
Total hot run time: 196210 ms

@doris-robot
Copy link

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

query1	0.04	0.03	0.03
query2	0.07	0.03	0.03
query3	0.24	0.06	0.07
query4	1.62	0.11	0.10
query5	0.43	0.42	0.41
query6	1.15	0.64	0.66
query7	0.02	0.02	0.02
query8	0.04	0.03	0.03
query9	0.59	0.50	0.52
query10	0.56	0.61	0.55
query11	0.14	0.10	0.10
query12	0.14	0.11	0.11
query13	0.62	0.60	0.59
query14	2.69	2.74	2.86
query15	0.89	0.82	0.83
query16	0.39	0.37	0.37
query17	1.06	1.04	1.05
query18	0.23	0.21	0.20
query19	2.01	1.88	1.98
query20	0.01	0.02	0.01
query21	15.37	0.92	0.56
query22	0.76	0.81	0.60
query23	15.34	1.40	0.56
query24	3.78	1.52	1.02
query25	0.28	0.11	0.08
query26	0.26	0.15	0.14
query27	0.05	0.05	0.04
query28	14.34	1.46	1.04
query29	12.57	3.94	3.23
query30	0.25	0.11	0.08
query31	2.82	0.57	0.38
query32	3.22	0.55	0.46
query33	3.12	3.11	3.13
query34	16.76	5.12	4.51
query35	4.50	4.40	4.52
query36	0.65	0.49	0.48
query37	0.09	0.06	0.06
query38	0.04	0.03	0.03
query39	0.03	0.02	0.03
query40	0.17	0.14	0.13
query41	0.08	0.03	0.03
query42	0.03	0.02	0.02
query43	0.04	0.04	0.03
Total cold run time: 107.49 s
Total hot run time: 31.24 s

@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Dec 25, 2024
Copy link
Contributor

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

Copy link
Contributor

PR approved by anyone and no changes requested.

"VAULT_NAME" = "${hdfsVaultName}"
);
"""
}, "vault name no change")
Copy link
Contributor

Choose a reason for hiding this comment

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

vault name no change -> unable to use the original vault name?

@apache apache deleted a comment from github-actions bot Dec 25, 2024
Copy link
Contributor

@MoanasDaddyXu MoanasDaddyXu 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

@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

@dataroaring dataroaring merged commit 8021633 into apache:master Dec 25, 2024
30 of 35 checks passed
github-actions bot pushed a commit that referenced this pull request Dec 25, 2024
* fix altering storage name but not writing disk in meta-service
* check vault if existed when altering stoarge vault name
dataroaring pushed a commit that referenced this pull request Dec 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by one committer. dev/3.0.4-merged reviewed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants