Merge pull request #351 from holland-backup/devel

fixes 349
holland-backup · Apr 26, 2022 · ab9fd2c · ab9fd2c
2 parents 77dcfe9 + a3575b0
commit ab9fd2c
Show file tree

Hide file tree

Showing 18 changed files with 42 additions and 42 deletions.
diff --git a/contrib/holland-commvault/setup.py b/contrib/holland-commvault/setup.py
@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-version = "1.2.9"
+version = "1.2.10"
 
 setup(
     name="holland_commvault",

diff --git a/plugins/holland.backup.example/setup.py b/plugins/holland.backup.example/setup.py
@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-version = "1.2.9"
+version = "1.2.10"
 
 setup(
     name="holland.backup.example",

diff --git a/plugins/holland.backup.mariabackup/setup.py b/plugins/holland.backup.mariabackup/setup.py
@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-version = "1.2.9"
+version = "1.2.10"
 
 setup(
     name="holland.backup.mariabackup",

diff --git a/plugins/holland.backup.mongodump/setup.py b/plugins/holland.backup.mongodump/setup.py
@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-version = "1.2.9"
+version = "1.2.10"
 
 setup(
     name="holland.backup.mongodump",

diff --git a/plugins/holland.backup.mysql_lvm/setup.py b/plugins/holland.backup.mysql_lvm/setup.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from setuptools import find_packages, setup
 
-version = "1.2.9"
+version = "1.2.10"
 
 setup(
     name="holland.backup.mysql_lvm",

diff --git a/plugins/holland.backup.mysqldump/setup.py b/plugins/holland.backup.mysqldump/setup.py
@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-version = "1.2.9"
+version = "1.2.10"
 
 setup(
     name="holland.backup.mysqldump",

diff --git a/plugins/holland.backup.pg_basebackup/setup.py b/plugins/holland.backup.pg_basebackup/setup.py
@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-version = "1.2.9"
+version = "1.2.10"
 
 setup(
     name="holland.backup.pg_basebackup",

diff --git a/plugins/holland.backup.pgdump/setup.py b/plugins/holland.backup.pgdump/setup.py
@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-version = "1.2.9"
+version = "1.2.10"
 
 setup(
     name="holland.backup.pgdump",

diff --git a/plugins/holland.backup.random/setup.py b/plugins/holland.backup.random/setup.py
@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-version = "1.2.9"
+version = "1.2.10"
 
 setup(
     name="holland.backup.random",

diff --git a/plugins/holland.backup.sqlite/setup.py b/plugins/holland.backup.sqlite/setup.py
@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-version = "1.2.9"
+version = "1.2.10"
 
 setup(
     name="holland.backup.sqlite",

diff --git a/plugins/holland.backup.tar/setup.py b/plugins/holland.backup.tar/setup.py
@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-version = "1.2.9"
+version = "1.2.10"
 
 setup(
     name="holland.backup.tar",

diff --git a/plugins/holland.backup.xtrabackup/holland/backup/xtrabackup/plugin.py b/plugins/holland.backup.xtrabackup/holland/backup/xtrabackup/plugin.py
@@ -34,6 +34,7 @@
 tmpdir              = string(default=None)
 additional-options  = force_list(default=list())
 pre-command         = string(default=None)
+strict             = boolean(default=yes)
 """
     + MYSQL_CLIENT_CONFIG_STRING
     + COMPRESSION_CONFIG_STRING
@@ -150,7 +151,9 @@ def backup(self):
         util.add_xtrabackup_defaults(self.defaults_path, tmpdir=tmpdir)
         args = util.build_xb_args(xb_cfg, backup_directory, self.defaults_path, binary_xtrabackup)
         util.execute_pre_command(
-            xb_cfg["pre-command"], backup_directory=backup_directory, backupdir=backup_directory
+            xb_cfg["pre-command"],
+            backup_directory=backup_directory,
+            backupdir=backup_directory,
         )
         stderr = self.open_xb_logfile()
         try:

diff --git a/plugins/holland.backup.xtrabackup/holland/backup/xtrabackup/util.py b/plugins/holland.backup.xtrabackup/holland/backup/xtrabackup/util.py
@@ -197,49 +197,46 @@ def build_xb_args(config, basedir, defaults_file=None, binary_xtrabackup=False):
     slave_info = config["slave-info"]
     safe_slave_backup = config["safe-slave-backup"]
     no_lock = config["no-lock"]
+    strict = config["strict"]
     # filter additional options to remove any empty values
     extra_opts = [_f for _f in config["additional-options"] if _f]
 
     args = [innobackupex]
+    if defaults_file:
+        args.append("--defaults-file=" + defaults_file)
+    if ibbackup:
+        args.append("--ibbackup=" + ibbackup)
+
     if not binary_xtrabackup:
-        if defaults_file:
-            args.append("--defaults-file=" + defaults_file)
-        if ibbackup:
-            args.append("--ibbackup=" + ibbackup)
         if stream:
             args.append("--stream=" + stream)
         else:
             basedir = join(basedir, "data")
         if tmpdir:
             args.append("--tmpdir=" + tmpdir)
-        if slave_info:
-            args.append("--slave-info")
-        if safe_slave_backup:
-            args.append("--safe-slave-backup")
-        if no_lock:
-            args.append("--no-lock")
-        args.append("--no-timestamp")
-        if extra_opts:
-            args.extend(extra_opts)
-        if basedir:
-            args.append(basedir)
     else:
-        if defaults_file:
-            args.append("--defaults-file=" + defaults_file)
         args.append("--backup")
-        if ibbackup:
-            args.append("--ibbackup=" + ibbackup)
         if stream:
             args.append("--stream=xbstream")
         else:
             args.append("--target-dir=%s" % join(basedir, "data"))
-        if slave_info:
-            args.append("--slave-info")
-        if safe_slave_backup:
-            args.append("--safe-slave-backup")
-        if no_lock:
-            args.append("--no-lock")
+
+    if slave_info:
+        args.append("--slave-info")
+    if safe_slave_backup:
+        args.append("--safe-slave-backup")
+    if no_lock:
+        args.append("--no-lock")
+
+    if not strict:
+        args.append("--strict=OFF")
+    if int(xtrabackup_version().split(".")[0]) < 8:
         args.append("--no-timestamp")
+
+    if not binary_xtrabackup:
+        if basedir:
+            args.append(basedir)
+    else:
         if extra_opts:
             args.extend(extra_opts)
     return args

diff --git a/plugins/holland.backup.xtrabackup/setup.py b/plugins/holland.backup.xtrabackup/setup.py
@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-version = "1.2.9"
+version = "1.2.10"
 
 setup(
     name="holland.backup.xtrabackup",

diff --git a/plugins/holland.lib.common/setup.py b/plugins/holland.lib.common/setup.py
@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-version = "1.2.9"
+version = "1.2.10"
 
 setup(
     name="holland.lib.common",

diff --git a/plugins/holland.lib.lvm/setup.py b/plugins/holland.lib.lvm/setup.py
@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-version = "1.2.9"
+version = "1.2.10"
 
 setup(
     name="holland.lib.lvm",

diff --git a/plugins/holland.lib.mysql/setup.py b/plugins/holland.lib.mysql/setup.py
@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-version = "1.2.9"
+version = "1.2.10"
 
 
 setup(

diff --git a/setup.py b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-version = "1.2.9"
+version = "1.2.10"
 
 setup(
     name="holland",