Merge pull request #2 from plesk/fix-distupgrade-with-mysql

Disable unsupported mysql modes before update the mysql database
plesk · Oct 27, 2023 · eb4a56b · eb4a56b
2 parents d4b4f88 + 246fbe1
commit eb4a56b
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 8 deletions.
diff --git a/actions/mariadb.py b/actions/mariadb.py
@@ -81,22 +81,42 @@ def estimate_prepare_time(self):
         return 60
 
 
-class InstallUbuntu20Mysql(action.ActiveAction):
+class DisableUnsupportedMysqlModes(action.ActiveAction):
     def __init__(self):
-        self.name = "installing mysql from ubuntu 20 official repository"
+        self.name = "disabling mysql modes unsupported mysql 8.0"
+        self.deprecated_modes = [
+            "ONLY_FULL_GROUP_BY",
+            "STRICT_TRANS_TABLES",
+            "NO_ZERO_IN_DATE",
+            "NO_ZERO_DATE",
+            "ERROR_FOR_DIVISION_BY_ZERO",
+            "NO_AUTO_CREATE_USER",
+            "NO_ENGINE_SUBSTITUTION",
+        ]
 
     def _is_required(self) -> bool:
         return mariadb.is_mysql_installed()
 
     def _prepare_action(self):
-        dpkg.depconfig_parameter_set("libraries/restart-without-asking", "true")
-        packages.install_packages(["mysql-server-5.7"], force_package_config=True)
+        for config_file in files.find_files_case_insensitive("/etc/mysql", "*.cnf", True):
+            files.backup_file(config_file)
+            for mode in self.deprecated_modes:
+                files.replace_string(config_file, mode + ",", " ")
+                files.replace_string(config_file, mode, " ")
 
     def _post_action(self):
-        dpkg.depconfig_parameter_set("libraries/restart-without-asking", "false")
+        for config_file in files.find_files_case_insensitive("/etc/mysql", "*.cnf", True):
+            files.remove_backup(config_file)
 
     def _revert_action(self):
-        dpkg.depconfig_parameter_set("libraries/restart-without-asking", "false")
+        for config_file in files.find_files_case_insensitive("/etc/mysql", "*.cnf", True):
+            files.restore_file_from_backup(config_file)
 
     def estimate_prepare_time(self):
-        return 60
+        return 10
+
+    def estimate_post_time(self):
+        return 10
+
+    def estimate_revert_time(self):
+        return 10
diff --git a/main.py b/main.py
@@ -143,6 +143,7 @@ def construct_actions(options: typing.Any, stage_flag: Stages) -> typing.Dict[in
             actions.DisablePleskSshBanner(),
             actions.RepairPleskInstallation(),
             actions.DisableMariadbInnodbFastShutdown(),
+            actions.DisableUnsupportedMysqlModes(),
             actions.InstallUbuntuUpdateManager(),
             actions.CleanApparmorCacheConfig(),
             actions.RestoreCurrentSpamassasinConfiguration(),
@@ -155,7 +156,6 @@ def construct_actions(options: typing.Any, stage_flag: Stages) -> typing.Dict[in
         2: [
             actions.InstallNextKernelVersion(),
             actions.InstallUbuntu20Mariadb(),
-            actions.InstallUbuntu20Mysql(),
             actions.InstallUdev(),
             actions.ReinstallSystemd(),
             actions.RemoveLXD(),