Merge pull request #369 from holland-backup/innodb_recovery.debug

Innodb recovery.debug

holland/core/command/command.py

@@ -84,6 +84,9 @@ class Command(object):
     description = " "
 
     def __init__(self):
+        if self.name in SUBPARSER.choices:
+            self.optparser = SUBPARSER.choices[self.name]
+            return
         self.optparser = SUBPARSER.add_parser(
             self.name,
             help=f"{self.name} {self.description}",

plugins/holland.backup.mariabackup/holland/backup/mariabackup/util.py

@@ -72,7 +72,7 @@ def mariabackup_version():
         raise BackupError("Failed to run %s: [%d] %s" % cmdline, exc.errno, exc.strerror)
 
     for line in process.stdout:
-        LOG.info("%s", line.rstrip())
+        LOG.info("# %s", line.rstrip().decode("UTF-8"))
     process.wait()
     if process.returncode != 0:
         raise BackupError("%s returned failure status [%d]" % (cmdline, process.returncode))

plugins/holland.backup.mysql_lvm/holland/backup/mysql_lvm/actions/mysql/innodb.py

@@ -40,6 +40,11 @@ def __call__(self, event, snapshot_fsm, snapshot):
         LOG.info("%s has stopped", mysqld_exe)
 
         if mysqld.returncode != 0:
+            LOG.error("Configuration file was:")
+            LOG.error("#######################")
+            for line in open(os.path.join(mycnf_path), "r"):
+                LOG.error("%s", line.rstrip())
+            LOG.error("#######################")
             datadir = self.mysqld_config["datadir"]
             for line in open(os.path.join(datadir, "innodb_recovery.log"), "r"):
                 LOG.error("%s", line.rstrip())

plugins/holland.backup.xtrabackup/holland/backup/xtrabackup/util.py

@@ -260,7 +260,7 @@ def xtrabackup_version():
             line = line.rstrip().decode("UTF-8")
         if "version" in line:
             xtrabackup_version = re.search(r"version\s*([\d.]+)", line).group(1)
-        LOG.info("%s", line)
+        LOG.info("# %s", line)
 
     process.wait()
     if process.returncode != 0: