Skip to content

Commit 1111d99

Browse files
author
Paweł Andruszkiewicz
committed
BUG#37686519 Exclude MRS-related accounts during dump/load
The following roles are now automatically excluded when dumping with the `ocimds` option enabled and when loading a dump into an MHS instance: * mysql_rest_service_admin * mysql_rest_service_data_provider * mysql_rest_service_dev * mysql_rest_service_meta_provider * mysql_rest_service_schema_admin * mysql_rest_service_user * mysql_task_admin * mysql_task_user Change-Id: I5b3108b36fbfdb5f41f186dc3ff3cb7d8dad427b
1 parent b8409cb commit 1111d99

File tree

2 files changed

+44
-5
lines changed

2 files changed

+44
-5
lines changed

modules/util/common/dump/constants.h

+16-4
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,22 @@ constexpr inline std::array k_excluded_users = {
3939
};
4040

4141
constexpr inline std::array k_mhs_excluded_users = {
42-
"administrator", "mysql_option_tracker_persister",
43-
"ociadmin", "ocidbm",
44-
"ocimonitor", "ocirpl",
45-
"oracle-cloud-agent", "rrhhuser",
42+
"administrator",
43+
"mysql_option_tracker_persister",
44+
"mysql_rest_service_admin",
45+
"mysql_rest_service_data_provider",
46+
"mysql_rest_service_dev",
47+
"mysql_rest_service_meta_provider",
48+
"mysql_rest_service_schema_admin",
49+
"mysql_rest_service_user",
50+
"mysql_task_admin",
51+
"mysql_task_user",
52+
"ociadmin",
53+
"ocidbm",
54+
"ocimonitor",
55+
"ocirpl",
56+
"oracle-cloud-agent",
57+
"rrhhuser",
4658
};
4759

4860
constexpr inline std::array k_excluded_schemas = {

unittest/scripts/auto/py_shell/scripts/util_dump_and_load_norecord.py

+28-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,34 @@ def prepare(sbport, options={}):
6565
session2.run_sql("set names utf8mb4")
6666

6767
# BUG#36159820 - accounts which are excluded when dumping with ocimds=true and when loading into MHS
68-
mhs_excluded_users = [ "administrator", "mysql_option_tracker_persister", "ociadmin", "ocidbm", "ocimonitor", "ocirpl", "oracle-cloud-agent", "rrhhuser" ]
68+
# BUG#37457569 - added mysql_option_tracker_persister
69+
# BUG#37686519 - added:
70+
# * mysql_rest_service_admin,
71+
# * mysql_rest_service_data_provider,
72+
# * mysql_rest_service_dev,
73+
# * mysql_rest_service_meta_provider,
74+
# * mysql_rest_service_schema_admin,
75+
# * mysql_rest_service_user,
76+
# * mysql_task_admin,
77+
# * mysql_task_user,
78+
mhs_excluded_users = [
79+
"administrator",
80+
"mysql_option_tracker_persister",
81+
"mysql_rest_service_admin",
82+
"mysql_rest_service_data_provider",
83+
"mysql_rest_service_dev",
84+
"mysql_rest_service_meta_provider",
85+
"mysql_rest_service_schema_admin",
86+
"mysql_rest_service_user",
87+
"mysql_task_admin",
88+
"mysql_task_user",
89+
"ociadmin",
90+
"ocidbm",
91+
"ocimonitor",
92+
"ocirpl",
93+
"oracle-cloud-agent",
94+
"rrhhuser",
95+
]
6996

7097
## Tests to ensure restricted users dumped with strip_restricted_grants can be loaded with a restricted user and not just with root
7198

0 commit comments

Comments
 (0)