Merge pull request #8 from plesk/support-cl-mariadb

Support cl mariadb installed by guvernor

README.md

@@ -28,7 +28,7 @@ Do not use the script if any of the following is true:
 - **More than one kernel named interfaces (like ethX) are not supported**. Stability of such names are not guaranteed, so leapp prevent the conversion in such cases.
 
 ## Requirements
-- Plesk version is more than five releases behind the latest version.
+- Plesk version is not older than five releases back from the latest version
 - CloudLinux 7.9 or later.
 - grub2 is installed
 - At least 5 GB of free disk space.

cloudlinux7to8/actions/mariadb.py

@@ -11,6 +11,7 @@
 KNOWN_MARIADB_REPO_FILES = [
     "mariadb.repo",
     "mariadb10.repo",
+    "cl-mysql.repo"
 ]
 MARIADB_PACKAGES = [
     "MariaDB-client",
@@ -27,6 +28,20 @@ def _find_mariadb_repo_files() -> typing.List[str]:
     return files.find_files_case_insensitive("/etc/yum.repos.d", KNOWN_MARIADB_REPO_FILES)
 
 
+def _is_governor_mariadb_installed() -> bool:
+    if not mariadb.is_mariadb_installed() and not mariadb.is_mysql_installed():
+        return False
+
+    repofiles = _find_mariadb_repo_files()
+    for repofile in repofiles:
+        for repo in rpm.extract_repodata(repofile):
+            _, _, repo_baseurl, _, _, _ = repo
+            if repo_baseurl and "repo.cloudlinux.com" in repo_baseurl and ("cl-mariadb" in repo_baseurl or "cl-mysql" in repo_baseurl):
+                return True
+
+    return False
+
+
 class AssertMariadbRepoAvailable(action.CheckAction):
     def __init__(self) -> None:
         self.name = "check mariadb repo available"
@@ -70,7 +85,7 @@ def __init__(self) -> None:
         self.name = "update modern mariadb"
 
     def _is_required(self) -> bool:
-        return mariadb.is_mariadb_installed() and mariadb.get_installed_mariadb_version() > MARIADB_VERSION_ON_ALMA
+        return mariadb.is_mariadb_installed() and mariadb.get_installed_mariadb_version() > MARIADB_VERSION_ON_ALMA and not _is_governor_mariadb_installed()
 
     def _prepare_action(self) -> action.ActionResult:
         repofiles = _find_mariadb_repo_files()
@@ -113,7 +128,7 @@ def __init__(self) -> None:
         self.name = "updating mariadb databases"
 
     def _is_required(self) -> bool:
-        return mariadb.is_mariadb_installed() and not mariadb.get_installed_mariadb_version() > MARIADB_VERSION_ON_ALMA
+        return mariadb.is_mariadb_installed() and not mariadb.get_installed_mariadb_version() > MARIADB_VERSION_ON_ALMA and not _is_governor_mariadb_installed()
 
     def _prepare_action(self) -> action.ActionResult:
         _remove_mariadb_packages()
@@ -148,6 +163,96 @@ def estimate_post_time(self) -> int:
         return 2 * 60
 
 
+FIRST_SUPPORTED_GOVERNOR_MARIADB_VERSION = mariadb.MariaDBVersion("10.2.44")
+
+
+class AssertMinGovernorMariadbVersion(action.CheckAction):
+    minimal_version: mariadb.MariaDBVersion
+
+    def __init__(self, version: mariadb.MariaDBVersion) -> None:
+        self.name = "check minimum guvernor mariadb version"
+        self.minimal_version = version
+        self.description = f"""
+The installed version of MariaDB is incompatible with the conversion process. To proceed, update MariaDB using Governor to version {str(self.minimal_version)!r} or later.
+"""
+
+    def _do_check(self) -> bool:
+        if not mariadb.is_mariadb_installed() or not _is_governor_mariadb_installed():
+            return True
+
+        return mariadb.get_installed_mariadb_version() >= self.minimal_version
+
+
+class AssertGovernorMysqlNotInstalled(action.CheckAction):
+    minimal_version: mariadb.MariaDBVersion
+
+    def __init__(self, version: mariadb.MariaDBVersion) -> None:
+        self.name = "check minimum governor mariadb version"
+        self.minimal_version = version
+        self.description = f"""
+MySQL installed by Governor is not compatible with the conversion process. To continue, use Governor to update MariaDB to at least version {str(self.minimal_version)!r}.
+"""
+
+    def _do_check(self) -> bool:
+        return not mariadb.is_mysql_installed() or not _is_governor_mariadb_installed()
+
+
+class UpdateGuvernorMariadb(action.ActiveAction):
+    def __init__(self) -> None:
+        self.name = "update modern mariadb installed from governor"
+
+    def _is_required(self) -> bool:
+        if not mariadb.is_mariadb_installed() or not _is_governor_mariadb_installed():
+            return False
+        # Actually the version should be checked by the AssertMinGovernorMariadbVersion pre-checker
+        # Therefore, if this execution occurs, we have likely forgotten to include the pre-checker in the process.
+        if mariadb.get_installed_mariadb_version() < FIRST_SUPPORTED_GOVERNOR_MARIADB_VERSION:
+            raise Exception(f"The installed version of MariaDB is not compatible with the conversion process. Please use Governor to update MariaDB to version {str(FIRST_SUPPORTED_GOVERNOR_MARIADB_VERSION)!r} or later.")
+
+        return True
+
+    def _prepare_action(self) -> action.ActionResult:
+        repofiles = _find_mariadb_repo_files()
+        if len(repofiles) == 0:
+            raise Exception("Mariadb installed from unknown repository. Please check the '{}' file is present".format("/etc/yum.repos.d/mariadb.repo"))
+
+        log.debug("Add MariaDB repository files '{}' mapping".format(repofiles[0]))
+        leapp_configs.add_repositories_mapping(repofiles)
+
+        # Unfortunately we can't rule source repositories for cl-MariaDB* packages at this point
+        # because they based on dnf modules, which will not be available in scope of leapp script.
+        # So we will have to reinstall packages after conversion process on CloudLinux 8 side.
+        return action.ActionResult()
+
+    def _post_action(self) -> action.ActionResult:
+        repofiles = _find_mariadb_repo_files()
+        if len(repofiles) == 0:
+            return action.ActionResult()
+
+        for repofile in repofiles:
+            leapp_configs.adopt_repositories(repofile)
+
+        mariadb_packages = rpm.get_installed_packages_list("cl-MariaDB*")
+        mariadb_version = mariadb.get_installed_mariadb_version()
+        mariadb_module = f"mariadb:cl-MariaDB{mariadb_version.major}{mariadb_version.minor}"
+        log.debug(f"Going to reinstall following packages with enabled dnf module {mariadb_module!r}: {mariadb_packages}")
+
+        rpm.remove_packages(rpm.filter_installed_packages(mariadb_packages))
+        util.logged_check_call(["dnf", "module", "enable", mariadb_module])
+        rpm.install_packages(mariadb_packages)
+
+        return action.ActionResult()
+
+    def _revert_action(self) -> action.ActionResult:
+        return action.ActionResult()
+
+    def estimate_prepare_time(self) -> int:
+        return 30
+
+    def estimate_post_time(self) -> int:
+        return 60
+
+
 class AddMysqlConnector(action.ActiveAction):
     def __init__(self) -> None:
         self.name = "install mysql connector"

cloudlinux7to8/upgrader.py

@@ -157,6 +157,7 @@ def construct_actions(
             "Update databases": [
                 custom_actions.UpdateMariadbDatabase(),
                 custom_actions.UpdateModernMariadb(),
+                custom_actions.UpdateGuvernorMariadb(),
                 custom_actions.AddMysqlConnector(),
             ],
             "Repositories handling": [
@@ -224,6 +225,8 @@ def get_check_actions(
             custom_actions.AssertPackagesUpToDate(),
             custom_actions.AssertNoOutdatedLetsEncryptExtRepository(),
             custom_actions.AssertPleskRepositoriesNotNoneLink(),
+            custom_actions.AssertMinGovernorMariadbVersion(custom_actions.FIRST_SUPPORTED_GOVERNOR_MARIADB_VERSION),
+            custom_actions.AssertGovernorMysqlNotInstalled(custom_actions.FIRST_SUPPORTED_GOVERNOR_MARIADB_VERSION),
         ]
 
         if not self.upgrade_postgres_allowed: