Allow both mysql and mariadb as owners of the data dir

Author: mariadb-AlexanderPresniakov

cmapi/cmapi_server/invariant_checks.py

@@ -2,7 +2,7 @@
 import os
 from typing import Optional, Tuple
 
-from mr_kot import Runner, Status, check, check_all, fact, parametrize
+from mr_kot import Runner, Status, any_of, check, check_all, fact, parametrize
 from mr_kot_fs_validators import GroupIs, HasMode, IsDir, OwnerIs
 
 from cmapi_server import helpers
@@ -87,7 +87,9 @@ def required_dirs_ownership(dir: str) -> Tuple[Status, str]:
     # Check ownership only when not in containers
     status, ev = check_all(
         dir,
-        OwnerIs('mysql'),
-        GroupIs('mysql'),
+        # The correct owner is mysql, but i've seen mariadb as owner of the mountpoint,
+        #   so we allow both
+        any_of(OwnerIs('mysql'), OwnerIs('mariadb')),
+        any_of(GroupIs('mysql'), GroupIs('mariadb')),
     )
     return (status, ev)

cmapi/requirements.in

@@ -19,5 +19,5 @@ typer==0.15.2
 pydantic==2.11.7
 sentry-sdk==2.34.1
 # Invariant checks
-mr_kot==0.8.5
-mr_kot_fs_validators==0.1.0
+mr_kot==0.9.1
+mr_kot_fs_validators==0.2.0

cmapi/requirements.txt

@@ -144,9 +144,9 @@ more-itertools==10.7.0
     #   cherrypy
     #   jaraco-functools
     #   jaraco-text
-mr-kot==0.8.5
+mr-kot==0.9.1
     # via -r requirements.in
-mr-kot-fs-validators==0.1.0
+mr-kot-fs-validators==0.2.0
     # via -r requirements.in
 multidict==6.6.4
     # via