Merge pull request #346 from holland-backup/devel

Allow pg_basedump to expand backup_directory/backupdir

contrib/holland-commvault/setup.py

@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-version = "1.2.8"
+version = "1.2.9"
 
 setup(
     name="holland_commvault",

plugins/holland.backup.example/setup.py

@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-version = "1.2.8"
+version = "1.2.9"
 
 setup(
     name="holland.backup.example",

plugins/holland.backup.mariabackup/setup.py

@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-version = "1.2.8"
+version = "1.2.9"
 
 setup(
     name="holland.backup.mariabackup",

plugins/holland.backup.mongodump/setup.py

@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-version = "1.2.8"
+version = "1.2.9"
 
 setup(
     name="holland.backup.mongodump",

plugins/holland.backup.mysql_lvm/setup.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from setuptools import find_packages, setup
 
-version = "1.2.8"
+version = "1.2.9"
 
 setup(
     name="holland.backup.mysql_lvm",

plugins/holland.backup.mysqldump/setup.py

@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-version = "1.2.8"
+version = "1.2.9"
 
 setup(
     name="holland.backup.mysqldump",

plugins/holland.backup.pg_basebackup/holland/backup/pg_basebackup/base.py

@@ -6,7 +6,6 @@
 
 # Python stdlib
 import os
-import shlex
 import subprocess
 import tempfile
 
@@ -21,6 +20,7 @@
 
 # Holland general compression functions
 from holland.lib.compression import open_stream
+from holland.lib.util import parse_arguments
 
 LOG = logging.getLogger(__name__)
 VER = None
@@ -193,15 +193,6 @@ def pgauth2args(config):
     return args
 
 
-def pg_extra_options(config):
-    """ Returns extra cli options based on pg_basebackup config """
-    args = []
-    additional_options = config["pg-basebackup"]["additional-options"]
-    if additional_options:
-        args += shlex.split(additional_options)
-    return args
-
-
 def generate_pgpassfile(backup_directory, password):
     """ Creates a pgpass file from a given password """
     fileobj = open(os.path.join(backup_directory, "pgpass"), "w")
@@ -222,7 +213,11 @@ def backup_pgsql(backup_directory, config):
     :raises: OSError, PgError on error
     """
     connection_params = pgauth2args(config)
-    extra_options = pg_extra_options(config)
+    extra_options = parse_arguments(
+        config["pg-basebackup"]["additional-options"],
+        backup_directory=backup_directory,
+        backupdir=backup_directory,
+    )
     out_format = config["pg-basebackup"]["format"]
     method = config["pg-basebackup"]["wal-method"]
 
@@ -268,16 +263,19 @@ def backup_pgsql(backup_directory, config):
 def dry_run(config):
     """ Logs what pg_basebackup command would be run """
     args = pgauth2args(config)
-
-    cmd = [
-        "pg_basebackup",
-        "-F",
-        config["pg-basebackup"]["format"],
-        "-D",
-        "-",
-        "-X",
-        config["pg-basebackup"]["wal-method"],
-    ] + args
+    cmd = (
+        [
+            "pg_basebackup",
+            "-F",
+            config["pg-basebackup"]["format"],
+            "-D",
+            "-",
+            "-X",
+            config["pg-basebackup"]["wal-method"],
+        ]
+        + args
+        + config["pg-basebackup"]["additional-options"]
+    )
 
     LOG.info("pg_dumpall -g")
     LOG.info(subprocess.list2cmdline(cmd))

plugins/holland.backup.pg_basebackup/holland/backup/pg_basebackup/interface.py

@@ -36,7 +36,7 @@
 format = option('tar','plain',default='tar')
 wal-method = option('none','fetch','stream',default='fetch')
 checkpoint = option('none','fast','spread',default='fast')
-additional-options = string(default=None)
+additional-options = force_list(default=list())
 
 [pgauth]
 username = string(default=None)

plugins/holland.backup.pg_basebackup/setup.py

@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-version = "1.2.8"
+version = "1.2.9"
 
 setup(
     name="holland.backup.pg_basebackup",

plugins/holland.backup.pgdump/setup.py

@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-version = "1.2.8"
+version = "1.2.9"
 
 setup(
     name="holland.backup.pgdump",

plugins/holland.backup.random/setup.py

@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-version = "1.2.8"
+version = "1.2.9"
 
 setup(
     name="holland.backup.random",

plugins/holland.backup.sqlite/setup.py

@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-version = "1.2.8"
+version = "1.2.9"
 
 setup(
     name="holland.backup.sqlite",

plugins/holland.backup.tar/setup.py

@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-version = "1.2.8"
+version = "1.2.9"
 
 setup(
     name="holland.backup.tar",

plugins/holland.backup.xtrabackup/setup.py

@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-version = "1.2.8"
+version = "1.2.9"
 
 setup(
     name="holland.backup.xtrabackup",

plugins/holland.lib.common/holland/lib/util.py

@@ -0,0 +1,16 @@
+"""
+Helpful functions
+"""
+
+from string import Template
+
+
+def parse_arguments(arguments, **kwargs):
+    """Replace varibles with values"""
+    if not arguments:
+        return arguments
+    if isinstance(arguments, list):
+        arguments = " ".join(arguments)
+    ret = Template(arguments).safe_substitute(**kwargs)
+    ret = ret.split(" ")
+    return ret

plugins/holland.lib.common/setup.py

@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-version = "1.2.8"
+version = "1.2.9"
 
 setup(
     name="holland.lib.common",

plugins/holland.lib.lvm/setup.py

@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-version = "1.2.8"
+version = "1.2.9"
 
 setup(
     name="holland.lib.lvm",

plugins/holland.lib.mysql/setup.py

@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-version = "1.2.8"
+version = "1.2.9"
 
 
 setup(

setup.py

@@ -1,6 +1,6 @@
 from setuptools import find_packages, setup
 
-version = "1.2.8"
+version = "1.2.9"
 
 setup(
     name="holland",