Merge "[MariaDB] Update chart for work with 11.x version"

Author: MOS CI

charts/infra/mariadb/templates/bin/_health.sh.tpl

@@ -18,7 +18,7 @@
 
 set -e
 
-MYSQL="mysql \
+MYSQL="mariadb \
   --defaults-file=/etc/mysql/admin_user.cnf \
   --host=localhost \
   --connect-timeout 2"
@@ -54,7 +54,7 @@ shift $((OPTIND-1))
 
 check_readiness () {
   if ! $MYSQL -e 'select 1' > /dev/null 2>&1 ; then
-      echo "Select from mysql failed"
+      echo "Select from mariadb failed"
       exit 1
   fi
 
@@ -86,25 +86,25 @@ check_readiness () {
 }
 
 check_liveness () {
-  if pidof mysql_upgrade > /dev/null 2>&1 ; then
-    echo "The process mysql_upgrade is active. Skip rest checks"
+  if pidof mariadb-upgrade > /dev/null 2>&1 ; then
+    echo "The process mariadb-upgrade is active. Skip rest checks"
     exit 0
   fi
-  if ! pidof mysqld > /dev/null 2>&1 ; then
-    echo "The mysqld pid not found"
+  if ! pidof mariadbd > /dev/null 2>&1 ; then
+    echo "The mariadbd pid not found"
     exit 1
   fi
   # NOTE(mkarpin): SST process may take significant time in case of large databases,
-  # killing mysqld during SST may destroy all data on the node.
+  # killing mariadbd during SST may destroy all data on the node.
   local datadir="/var/lib/mysql"
   if [ -f ${datadir}/sst_in_progress ]; then
-      echo "SST is still in progress, skip further checks as mysql won't respond"
+      echo "SST is still in progress, skip further checks as mariadb won't respond"
   else
       # NOTE(vsaienko): in some cases maria might stuck during IST, or when neighbours
-      # IPs are changed. Here we check that we can connect to mysql socket to ensure
+      # IPs are changed. Here we check that we can connect to mariadb socket to ensure
       # process is alive.
       if ! $MYSQL -e "show status like 'wsrep_cluster_status'" > /dev/null 2>&1 ; then
-          echo "Can't connect to mysql socket"
+          echo "Can't connect to mariadb socket"
           exit 1
       fi
       # Detect node that is not connected to wsrep provider

charts/infra/mariadb/templates/bin/_mariadb_resque.py.tpl

@@ -19,7 +19,7 @@ r"""
     The script provides tooling for resque operations (e.g data backup, data restore) procedure
     for mariadb galera cluster (master-master) in k8s/helm environment.
     Currently supported:
-        - physical data backup and restore using mariabackup.
+        - physical data backup and restore using mariadb-backup.
         - upload of backups to remote storage (s3).
         - download of backups from remote storage, if local backups are not valid.
 
@@ -564,11 +564,11 @@ def run_cmd(popenargs,
 
 
 def get_mariabackup_version():
-    """ $ mariabackup --version
-    mariabackup based on MariaDB server 10.6.17-MariaDB debian-linux-gnu (x86_64)
+    """ $ mariadb-backup --version
+    mariadb-backup based on MariaDB server 10.6.17-MariaDB debian-linux-gnu (x86_64)
     """
-    cmd_res = run_cmd(["mariabackup", "--version"], return_stderr=True)[2][0]
-    res = re.search(MARIADB_VERSION_REGEX, cmd_res)
+    cmd_res = run_cmd(["mariadb-backup", "--version"], return_stderr=True)[2]
+    res = re.search(MARIADB_VERSION_REGEX, " ".join(cmd_res))
     return {"major": res.group(1), "minor": res.group(2), "patch": res.group(3)}
 
 
@@ -588,22 +588,19 @@ def find_latest_backup(path):
             raise Exception(f"Successful backup not found at {backup_path} !!!! Cannot proceed")
         return back_dir
 
+def get_backup_version():
 
-def get_backup_version(path=None):
-    base_back_path = SETTINGS.base_back_path
-
-    def find_latest_xtrabackup_info(path):
+    def find_latest_backup_info(path):
         back_dirs = sorted(get_dirs(path), reverse=True)
         for d in back_dirs:
-            if "xtrabackup_info" in os.listdir(f"{path}/{d}"):
-                return f"{path}/{d}/xtrabackup_info"
-
-    if path:
-        xtrab_info = f"{path}/xtrabackup_info"
-    else:
-        xtrab_info = find_latest_xtrabackup_info(base_back_path)
-    if xtrab_info:
-        with open(xtrab_info) as f:
+            for info_file in ["mariadb_backup_info", "xtrabackup_info"]:
+                info_file_path = os.path.join(path, d, info_file)
+                if os.path.exists(info_file_path):
+                    return info_file_path
+
+    backup_info = find_latest_backup_info(SETTINGS.base_back_path)
+    if backup_info:
+        with open(backup_info) as f:
             for line in f:
                 if line.startswith("tool_version"):
                     res = re.search(MARIADB_VERSION_REGEX, line.split("=")[1].strip())
@@ -1157,7 +1154,7 @@ def main():
         pre_backup_sanity_check(ready_pods, synced_state)
 
         logger.info(f"Target replica is: {SETTINGS.mariadb_target_replica}")
-        # we need pod ip as mariabackup util doesn't work with fqdn
+        # we need pod ip as mariadb-backup util doesn't work with fqdn
         mariadb_pod_ip = get_target_replica_ip(ready_pods, SETTINGS.mariadb_target_replica)
         # target_dir and incremental_base_dir are required in operation kwargs
         # according to get_operation_cmd_args, we can remove them from operation

charts/infra/mariadb/templates/bin/_run_mariadb_resque.sh.tpl

@@ -8,7 +8,7 @@ cat << EOF
     The script provides tooling for resque operations (e.g data backup, data restore) of mariadb
     galera cluster member.
     Currently supported:
-        - physical data backup and restore using mariabackup.
+        - physical data backup and restore using mariadb-backup.
     Example of resulting backup directory structure:
 
     /var/backup
@@ -251,9 +251,9 @@ function post_operation_info(){
 }
 
 function set_global_variables(){
-    BACKCMD=mariabackup
+    BACKCMD=mariadb-backup
     BACKDIR=/var/backup
-    LOCKDIR="${BACKDIR}/mariabackup.lock"
+    LOCKDIR="${BACKDIR}/mariadb-backup.lock"
     MARIADB_CLIENT_CONF=${MARIADB_CLIENT_CONF:-/etc/mysql/mariabackup_user.cnf}
     USEROPTIONS="--defaults-file=${MARIADB_CLIENT_CONF}"
     BASEBACKDIR="${BACKDIR}/base"
@@ -304,7 +304,7 @@ function pre_backup_sanity_check() {
     local available_space
     local db_size
     local required_space
-    mysql $USEROPTIONS -s -e 'exit' || die $LINENO "FATAL ERROR: Could not connect to mysql with provided credentials"
+    mariadb $USEROPTIONS -s -e 'exit' || die $LINENO "FATAL ERROR: Could not connect to mariadb with provided credentials"
     # check available space on device in KB
     available_space=$(df --output=avail -k ${BACKDIR} | sed 's/[^0-9]*//g' | tr -d '[:space:]')
     # Calculate current db size
@@ -384,7 +384,7 @@ function prepare_backup_for_restore(){
 
 function run_restore() {
     # TODO: implement rollback of restore
-    # mariabackup requires datadir to be clean
+    # mariadb-backup requires datadir to be clean
     local latest_grastate_file
     if [[ ! "${TARGET_INCR_BACKUP_DIRS}" ]]; then
         echo "NO incremental backups found for base backup ${TARGET_BASE_BACKUP_DIR}, only base backup will be restored"
@@ -416,19 +416,24 @@ function cleanup_unarchieved_data(){
 }
 
 function get_mariabackup_version() {
-    echo "$(${BACKCMD} --version 2>&1 | sed -nE 's/.*(10\.[0-9]{1,2}\.[0-9]{1,2}-MariaDB).*/\1/p')"
+    echo "$(${BACKCMD} --version 2>&1 | sed -nE 's/.*([0-9]{2}\.[0-9]{1,2}\.[0-9]{1,2}-MariaDB).*/\1/p')"
 }
 
 function get_backup_version() {
     local backup=$1
     # if function called without params, we looking for latest full backup and return its version
     if [[ ! ${backup} ]]; then
-        backup=$(find ${BASEBACKDIR} -mindepth 1 -name xtrabackup_info -printf "%h\n" | sort | tail -1)
+        backup=$(find ${BASEBACKDIR} -mindepth 1 -name *backup_info -printf "%h\n" | sort | tail -1)
     fi
     if [[ ! ${backup} ]]; then
         echo "No-backups"
     else
-        echo "$(cat ${backup}/xtrabackup_info | grep tool_version | cut -d' ' -f3)"
+        for info_file in mariadb_backup_info xtrabackup_info; do
+            if [[ -f ${backup}/${info_file} ]]; then
+                echo "$(cat ${backup}/${info_file} | grep tool_version | cut -d' ' -f3)"
+                break
+            fi
+        done
     fi
 }
 

charts/infra/mariadb/templates/bin/_start.py.tpl

@@ -34,7 +34,7 @@ import kubernetes.client
 import kubernetes.config
 
 #set one name for all commands, avoid "magic names"
-MYSQL_BINARY_NAME='mysqld'
+MYSQL_BINARY_NAME='mariadbd'
 
 # Create logger, console handler and formatter
 logger = logging.getLogger('OpenStack-Helm Mariadb')
@@ -182,8 +182,8 @@ def wait_mysql_status(delay=30):
     i = 0
     res = 1
     while True:
-        logger.info("Checking mysql status {0}".format(i))
-        res = run_cmd_with_logging(['mysqladmin', 'status', "-u{0}".format(mysql_dbadmin_username),
+        logger.info("Checking mariadb status {0}".format(i))
+        res = run_cmd_with_logging(['mariadb-admin', 'status', "-u{0}".format(mysql_dbadmin_username),
             "-p{0}".format(mysql_dbadmin_password)], logger)
         if res == 0:
             logger.info("mariadb status check passed")
@@ -195,8 +195,8 @@ def wait_mysql_status(delay=30):
 
 
 def stop_mysqld():
-    """Stop mysqld, assuming pid file in default location."""
-    logger.info("Shutting down any mysqld instance if required")
+    """Stop mariadbd, assuming pid file in default location."""
+    logger.info("Shutting down any mariadbd instance if required")
     mysqld_pidfile_path = "/var/lib/mysql/{0}.pid".format(local_hostname)
 
     def is_pid_running(pid):
@@ -213,7 +213,7 @@ def stop_mysqld():
             return False
 
     if not os.path.isfile(mysqld_pidfile_path):
-        logger.debug("No previous pid file found for mysqld")
+        logger.debug("No previous pid file found for mariadbd")
         return
 
     if os.stat(mysqld_pidfile_path).st_size == 0:
@@ -223,7 +223,7 @@ def stop_mysqld():
         return
 
     logger.info(
-        "Previous pid file found for mysqld, attempting to shut it down")
+        "Previous pid file found for mariadbd, attempting to shut it down")
     with open(mysqld_pidfile_path, "r") as mysqld_pidfile:
         mysqld_pid = int(mysqld_pidfile.readlines()[0].rstrip('\n'))
 
@@ -235,11 +235,11 @@ def stop_mysqld():
         return
     if not is_pid_mysqld(mysqld_pid):
         logger.error(
-            "pidfile process is not mysqld, removing pidfile and panic")
+            "pidfile process is not mariadbd, removing pidfile and panic")
         os.remove(mysqld_pidfile_path)
         sys.exit(1)
 
-    logger.info("pid from pidfile is mysqld")
+    logger.info("pid from pidfile is mariadbd")
     os.kill(mysqld_pid, 15)
     try:
         pid, status = os.waitpid(mysqld_pid, 0)
@@ -283,7 +283,7 @@ def mysqld_write_cluster_conf(mode='run'):
         cluster_config.write(configfile)
 
 
-# Function to setup mysqld
+# Function to setup mariadbd
 def mysqld_bootstrap():
     """Bootstrap the db if no data found in the 'bootstrap_test_dir'"""
     logger.info("Boostrapping Mariadb")
@@ -293,7 +293,7 @@ def mysqld_bootstrap():
         stop_mysqld()
         mysqld_write_cluster_conf(mode='bootstrap')
         run_cmd_with_logging([
-            'mysql_install_db', '--user=mysql',
+            'mariadb-install-db', '--user=mysql',
             "--datadir={0}".format(mysql_data_dir)
         ], logger)
         if not mysql_dbaudit_username:
@@ -310,7 +310,7 @@ def mysqld_bootstrap():
                 "GRANT PROCESS, RELOAD, LOCK TABLES, REPLICATION CLIENT ON *.* TO '{2}'@'127.0.0.1' ;\n"
                 "CREATE OR REPLACE USER '{4}'@'%' IDENTIFIED BY '{5}' ;\n"
                 "GRANT PROCESS, RELOAD, LOCK TABLES, REPLICATION CLIENT ON *.* TO '{4}'@'%' ;\n"
-                # needed for mariabackup --history option
+                # needed for mariadb-backup --history option
                 "GRANT CREATE, INSERT ON PERCONA_SCHEMA.* TO '{4}'@'%';\n"
                 "FLUSH PRIVILEGES ;\n"
                 "SHUTDOWN ;".format(mysql_dbadmin_username, mysql_dbadmin_password,
@@ -328,7 +328,7 @@ def mysqld_bootstrap():
                 "GRANT SELECT ON *.* TO '{4}'@'%' ;\n"
                 "CREATE OR REPLACE USER '{6}'@'%' IDENTIFIED BY '{7}' ;\n"
                 "GRANT PROCESS, RELOAD, LOCK TABLES, REPLICATION CLIENT ON *.* TO '{6}'@'%' ;\n"
-                # needed for mariabackup --history option
+                # needed for mariadb-backup --history option
                 "GRANT CREATE, INSERT ON PERCONA_SCHEMA.* TO '{6}'@'%';\n"
                 "FLUSH PRIVILEGES ;\n"
                 "SHUTDOWN ;".format(mysql_dbadmin_username, mysql_dbadmin_password,
@@ -847,7 +847,7 @@ def launch_leader_election():
 
 
 def run_mysqld(cluster='existing'):
-    """Launch the mysqld instance for the pod. This will also run mysql upgrade
+    """Launch the mariadbd instance for the pod. This will also run mariadb upgrade
     if we are the 1st replica, and the rest of the cluster is already running.
     This senario will be triggerd either following a rolling update, as this
     works in reverse order for statefulset. Or restart of the 1st instance, in
@@ -868,7 +868,7 @@ def run_mysqld(cluster='existing'):
     mysql_data_dir = '/var/lib/mysql'
     db_test_dir = "{0}/mysql".format(mysql_data_dir)
     if os.path.isdir(db_test_dir):
-        logger.info("Setting the admin passwords to the current value and upgrade mysql if needed")
+        logger.info("Setting the admin passwords to the current value and upgrade mariadb if needed")
         if not mysql_dbaudit_username:
             template = (
                 "CREATE OR REPLACE USER '{0}'@'%' IDENTIFIED BY \'{1}\' ;\n"
@@ -877,7 +877,7 @@ def run_mysqld(cluster='existing'):
                 "GRANT PROCESS, RELOAD, LOCK TABLES, REPLICATION CLIENT ON *.* TO '{2}'@'127.0.0.1' ;\n"
                 "CREATE OR REPLACE USER '{4}'@'%' IDENTIFIED BY '{5}' ;\n"
                 "GRANT PROCESS, RELOAD, LOCK TABLES, REPLICATION CLIENT ON *.* TO '{4}'@'%' ;\n"
-                # needed for mariabackup --history option
+                # needed for mariadb-backup --history option
                 "GRANT CREATE, INSERT ON PERCONA_SCHEMA.* TO '{4}'@'%';\n"
                 "FLUSH PRIVILEGES ;".format(mysql_dbadmin_username, mysql_dbadmin_password,
                                             mysql_dbsst_username, mysql_dbsst_password,
@@ -892,7 +892,7 @@ def run_mysqld(cluster='existing'):
                 "GRANT SELECT ON mysql.user TO '{4}'@'%' ;\n"
                 "CREATE OR REPLACE USER '{6}'@'%' IDENTIFIED BY '{7}' ;\n"
                 "GRANT PROCESS, RELOAD, LOCK TABLES, REPLICATION CLIENT ON *.* TO '{6}'@'%' ;\n"
-                # needed for mariabackup --history option
+                # needed for mariadb-backup --history option
                 "GRANT CREATE, INSERT ON PERCONA_SCHEMA.* TO '{6}'@'%';\n"
                 "FLUSH PRIVILEGES ;".format(mysql_dbadmin_username, mysql_dbadmin_password,
                                             mysql_dbsst_username, mysql_dbsst_password,
@@ -902,15 +902,15 @@ def run_mysqld(cluster='existing'):
         with open(bootstrap_sql_file, 'w') as f:
             f.write(template)
             f.close()
-        # run mysqld as thread and check it's status in order to upgrade it
+        # run mariadbd as thread and check it's status in order to upgrade it
         run_cmd_with_logging_thread = threading.Thread(target=run_cmd_with_logging, args=([
             MYSQL_BINARY_NAME, '--bind-address=127.0.0.1', '--wsrep-on=false',
             "--init-file={0}".format(bootstrap_sql_file)
         ], logger))
         run_cmd_with_logging_thread.start()
         wait_mysql_status()
-        logger.info("Upgrading local mysql instance")
-        upgrade_res = run_cmd_with_logging(['mysql_upgrade', '--skip-write-binlog',
+        logger.info("Upgrading local mariadb instance")
+        upgrade_res = run_cmd_with_logging(['mariadb-upgrade', '--skip-write-binlog',
             "-u{0}".format(mysql_dbadmin_username), "-p{0}".format(mysql_dbadmin_password)], logger)
         if upgrade_res != 0:
             raise Exception('Mysql upgrade failed, cannot proceed')
@@ -930,14 +930,14 @@ def run_mysqld(cluster='existing'):
 
 
 def mysqld_reboot():
-    """Reboot a mysqld cluster."""
+    """Reboot a mariadbd cluster."""
     declare_myself_cluster_leader()
     set_grastate_val(key='safe_to_bootstrap', value='1')
     run_mysqld(cluster='new')
 
 
 def sigterm_shutdown(x, y):
-    """Shutdown the instance of mysqld on shutdown signal."""
+    """Shutdown the instance of mariadbd on shutdown signal."""
     logger.info("Got a sigterm from the container runtime, time to go.")
     stop_event.set()
     stop_mysqld()

charts/infra/mariadb/templates/bin/_test.sh.tpl

@@ -17,7 +17,7 @@ set -ex
 
 rm -f /tmp/test-success
 
-mysqlslap \
+mariadb-slap \
   --defaults-file=/etc/mysql/test-params.cnf \
   {{ include "helm-toolkit.utils.joinListWithSpace" $.Values.conf.tests.params }} -vv \
   --post-system="touch /tmp/test-success"