Skip to content

Commit c273d33

Browse files
committed
Update Governor-related messages and hints in cl-MySQL actor with more details
1 parent a0a86ee commit c273d33

1 file changed

Lines changed: 16 additions & 13 deletions

File tree

repos/system_upgrade/cloudlinux/actors/clmysqlrepositorysetup/libraries/clmysql_cloudlinux.py

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def clmysql_process(lib, repofile_name, repofile_data):
4141
reporting.Summary(
4242
"MySQL Governor records the installed database type as '{governor}', "
4343
"but the mysqld binary on disk belongs to '{rpm}'. "
44-
"This usually means 'mysqlgovernor.py --mysql-version' was run "
44+
"This usually means '/usr/share/lve/dbgovernor/mysqlgovernor.py --mysql-version' was run "
4545
"without a follow-up '--install', or packages were changed manually. "
4646
"Proceeding could enable the wrong DNF module stream and break the upgrade.".format(
4747
governor=detected.governor_type, rpm=detected.pkg_type
@@ -56,11 +56,11 @@ def clmysql_process(lib, repofile_name, repofile_data):
5656
hint=(
5757
"Examine the current state of the system's DB packages."
5858
"Complete the pending Governor install:\n"
59-
" mysqlgovernor.py --mysql-version={governor}\n"
60-
" mysqlgovernor.py --install --yes\n"
59+
" /usr/share/lve/dbgovernor/mysqlgovernor.py --mysql-version={governor}\n"
60+
" /usr/share/lve/dbgovernor/mysqlgovernor.py --install --yes\n"
6161
"Or reset Governor to match the actual packages:\n"
62-
" mysqlgovernor.py --mysql-version={rpm}\n"
63-
" mysqlgovernor.py --install --yes\n"
62+
" /usr/share/lve/dbgovernor/mysqlgovernor.py --mysql-version={rpm}\n"
63+
" /usr/share/lve/dbgovernor/mysqlgovernor.py --install --yes\n"
6464
"Then restart the upgrade process.".format(
6565
governor=detected.governor_type, rpm=detected.pkg_type
6666
)
@@ -109,7 +109,7 @@ def clmysql_process(lib, repofile_name, repofile_data):
109109
"The detected database type is '{}', but the cl-mysql-meta "
110110
"repo URL points to '{}'. "
111111
"This may happen when the database version was changed "
112-
"without a follow-up 'mysqlgovernor.py --install', or the "
112+
"without a follow-up '/usr/share/lve/dbgovernor/mysqlgovernor.py --install', or the "
113113
"cl-mysql.repo file was manually edited. "
114114
"Proceeding with the wrong repository would result in "
115115
"an incorrect upgrade operation."
@@ -125,13 +125,16 @@ def clmysql_process(lib, repofile_name, repofile_data):
125125
reporting.Groups([reporting.Groups.INHIBITOR]),
126126
reporting.Remediation(
127127
hint=(
128-
"Re-run MySQL Governor to regenerate the repository file: "
129-
"mysqlgovernor.py --install --yes, "
130-
"then restart the upgrade process. "
131-
"Alternatively, if the repository file was manually edited, "
132-
"either correct the baseurl to match the installed DB type or "
133-
"set the desired DB type in Governor and re-run --install "
134-
"to have it write the correct URL."
128+
"Download the correct repository file for the installed "
129+
"database type: "
130+
"curl -o /etc/yum.repos.d/cl-mysql.repo "
131+
"http://repo.cloudlinux.com/other/"
132+
"cl${{releasever}}/mysqlmeta/{expected}-common.repo\n"
133+
"Or re-run MySQL Governor to regenerate it "
134+
"(this reinstalls the full DB stack): "
135+
"/usr/share/lve/dbgovernor/mysqlgovernor.py --install --yes\n"
136+
"Then restart the upgrade process."
137+
.format(expected=expected_fragment)
135138
)
136139
),
137140
]

0 commit comments

Comments
 (0)