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

Revert "[feature](backup) backup and restore privileges catalogs workloadgroup (#44905)" #45998

Merged
merged 1 commit into from
Dec 26, 2024

Conversation

Jibing-Li
Copy link
Contributor

@Jibing-Li Jibing-Li commented Dec 26, 2024

This reverts commit 8e57386.
#44905

lock object in PasswordPolicy is written to disk, when user upgrade from older version, this lock will null, and cause user couldn't connect to Doris.

Code cause this issue in PasswordPolicy:

    @SerializedName(value = "lock")
    private ReentrantReadWriteLock lock = new ReentrantReadWriteLock();

@Thearas
Copy link
Contributor

Thearas commented Dec 26, 2024

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?

@Jibing-Li Jibing-Li marked this pull request as ready for review December 26, 2024 04:21
@Jibing-Li
Copy link
Contributor Author

run buildall

@doris-robot
Copy link

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

------ Round 1 ----------------------------------
q1	17585	6136	6082	6082
q2	2046	296	163	163
q3	10425	1251	743	743
q4	10204	853	426	426
q5	7532	2185	1930	1930
q6	212	184	149	149
q7	897	743	622	622
q8	9236	1381	1165	1165
q9	5487	4972	4985	4972
q10	6789	2288	1857	1857
q11	484	270	256	256
q12	367	385	223	223
q13	17754	3609	2966	2966
q14	241	244	211	211
q15	557	505	512	505
q16	628	633	589	589
q17	556	854	337	337
q18	7031	6444	6414	6414
q19	1242	963	572	572
q20	320	350	199	199
q21	2860	2217	1996	1996
q22	364	332	315	315
Total cold run time: 102817 ms
Total hot run time: 32692 ms

----- Round 2, with runtime_filter_mode=off -----
q1	6250	6255	6264	6255
q2	235	324	230	230
q3	2267	2629	2309	2309
q4	1401	1834	1383	1383
q5	4377	4743	4676	4676
q6	181	173	140	140
q7	1963	1837	1693	1693
q8	2495	2713	2613	2613
q9	6898	6889	6888	6888
q10	2960	3213	2688	2688
q11	561	523	510	510
q12	616	718	570	570
q13	3204	3559	2971	2971
q14	276	292	263	263
q15	549	503	504	503
q16	654	682	656	656
q17	1178	1709	1230	1230
q18	7322	7201	7206	7201
q19	836	1145	1044	1044
q20	1863	1905	1864	1864
q21	5459	5196	4876	4876
q22	605	631	588	588
Total cold run time: 52150 ms
Total hot run time: 51151 ms

@doris-robot
Copy link

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

query1	964	378	352	352
query2	6523	2239	2274	2239
query3	6711	213	206	206
query4	33564	23764	23988	23764
query5	5039	632	482	482
query6	276	210	178	178
query7	4625	500	300	300
query8	286	232	229	229
query9	9625	2767	2743	2743
query10	508	331	240	240
query11	18643	15346	15038	15038
query12	157	109	109	109
query13	1668	554	424	424
query14	10948	7928	6988	6988
query15	241	199	193	193
query16	7949	637	467	467
query17	1546	747	573	573
query18	2101	409	302	302
query19	208	176	156	156
query20	131	117	109	109
query21	213	129	107	107
query22	4361	4450	4283	4283
query23	34231	33432	33481	33432
query24	6322	2190	2253	2190
query25	474	443	386	386
query26	1199	264	149	149
query27	2052	442	330	330
query28	5163	2461	2445	2445
query29	706	536	402	402
query30	234	180	150	150
query31	1007	866	827	827
query32	93	59	59	59
query33	543	343	271	271
query34	747	841	509	509
query35	806	802	744	744
query36	1007	1038	970	970
query37	119	102	74	74
query38	4307	4072	4183	4072
query39	1491	1443	1474	1443
query40	208	112	96	96
query41	69	46	46	46
query42	113	101	101	101
query43	498	528	483	483
query44	1369	815	805	805
query45	179	173	180	173
query46	860	1028	643	643
query47	1900	1903	1841	1841
query48	393	393	311	311
query49	764	467	416	416
query50	626	643	395	395
query51	7274	7241	7182	7182
query52	101	101	95	95
query53	215	262	179	179
query54	482	481	413	413
query55	80	77	82	77
query56	247	276	234	234
query57	1205	1188	1098	1098
query58	230	224	229	224
query59	3027	2970	3036	2970
query60	294	261	243	243
query61	107	114	105	105
query62	855	802	762	762
query63	223	191	188	188
query64	4598	995	668	668
query65	3286	3214	3221	3214
query66	1058	424	306	306
query67	15943	15765	15601	15601
query68	9640	756	523	523
query69	457	290	251	251
query70	1252	1144	1090	1090
query71	441	296	252	252
query72	5800	3834	3838	3834
query73	680	747	355	355
query74	9724	9037	9169	9037
query75	4614	3125	2678	2678
query76	5298	1170	797	797
query77	1023	358	270	270
query78	10050	10356	9535	9535
query79	3232	893	590	590
query80	649	521	442	442
query81	465	362	235	235
query82	649	146	128	128
query83	183	165	148	148
query84	289	94	71	71
query85	774	349	301	301
query86	348	314	296	296
query87	4427	4540	4367	4367
query88	4315	2228	2212	2212
query89	410	332	324	324
query90	1948	187	187	187
query91	133	134	103	103
query92	68	54	103	54
query93	1112	897	547	547
query94	666	388	296	296
query95	327	268	253	253
query96	493	593	277	277
query97	2751	2777	2626	2626
query98	239	206	199	199
query99	1702	1570	1416	1416
Total cold run time: 297151 ms
Total hot run time: 190498 ms

@doris-robot
Copy link

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

query1	0.03	0.03	0.04
query2	0.07	0.04	0.03
query3	0.24	0.06	0.07
query4	1.62	0.10	0.10
query5	0.40	0.43	0.39
query6	1.18	0.65	0.64
query7	0.02	0.01	0.02
query8	0.04	0.03	0.03
query9	0.58	0.50	0.50
query10	0.56	0.57	0.56
query11	0.15	0.11	0.10
query12	0.15	0.11	0.11
query13	0.60	0.60	0.61
query14	2.75	2.84	2.72
query15	0.90	0.82	0.83
query16	0.38	0.38	0.38
query17	1.02	1.02	1.05
query18	0.23	0.22	0.21
query19	1.88	1.79	2.01
query20	0.02	0.01	0.01
query21	15.37	0.88	0.59
query22	0.77	0.73	0.68
query23	15.37	1.46	0.55
query24	2.92	1.72	2.06
query25	0.19	0.12	0.04
query26	0.27	0.15	0.14
query27	0.06	0.05	0.06
query28	14.40	1.63	1.05
query29	12.53	3.94	3.30
query30	0.24	0.09	0.07
query31	2.84	0.61	0.37
query32	3.23	0.57	0.46
query33	3.09	3.21	3.16
query34	16.65	5.25	4.48
query35	4.45	4.44	4.42
query36	0.65	0.51	0.49
query37	0.10	0.06	0.06
query38	0.05	0.04	0.04
query39	0.03	0.02	0.02
query40	0.17	0.13	0.14
query41	0.09	0.03	0.02
query42	0.04	0.02	0.02
query43	0.03	0.03	0.03
Total cold run time: 106.36 s
Total hot run time: 32 s

@github-actions github-actions bot added the approved Indicates a PR has been approved by one committer. label Dec 26, 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.

@Jibing-Li
Copy link
Contributor Author

run p0

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

@Jibing-Li
Copy link
Contributor Author

run p0

@Jibing-Li Jibing-Li merged commit a1439fd into apache:master Dec 26, 2024
25 of 27 checks passed
@Jibing-Li Jibing-Li deleted the revert branch December 26, 2024 08:34
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. reviewed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants