Mar 3, 2018 · Feb 6, 2018 · Feb 14, 2018 · Mar 1, 2018 · Mar 1, 2018 · Mar 1, 2018
diff --git a/testgres/backup.py b/testgres/backup.py
 import tempfile

 from six import raise_from
 from enum import Enum

 from .consts import \
    DATA_DIR, \
    PG_CONF_FILE, \
    BACKUP_LOG_FILE, \
    DEFAULT_XLOG_METHOD
    BACKUP_LOG_FILE

 from .exceptions import BackupException

    execute_utility


 class XLogMethod(Enum):
    """
    Available WAL methods for NodeBackup
    """

    none = 'none'
    fetch = 'fetch'
    stream = 'stream'


 class NodeBackup(object):
    """
    Smart object responsible for backups
                 node,
                 base_dir=None,
                 username=None,
                 xlog_method=DEFAULT_XLOG_METHOD):
                 xlog_method=XLogMethod.fetch):
        """
        Create a new backup.

        if not node.status():
            raise BackupException('Node must be running')

        # Check arguments
        if not isinstance(xlog_method, XLogMethod):
            try:
                xlog_method = XLogMethod(xlog_method)
            except ValueError:
                raise BackupException('Invalid xlog_method "{}"'.format(xlog_method))

        # Set default arguments
        username = username or default_username()
        base_dir = base_dir or tempfile.mkdtemp()
            "-h", node.host,
            "-U", username,
            "-D", data_dir,
            "-X", xlog_method
            "-X", xlog_method.value
        ]
        execute_utility(_params, self.log_file)

diff --git a/testgres/consts.py b/testgres/consts.py
 PG_LOG_FILE = "postgresql.log"
 UTILS_LOG_FILE = "utils.log"
 BACKUP_LOG_FILE = "backup.log"

 # default argument value
 DEFAULT_XLOG_METHOD = "fetch"
diff --git a/testgres/node.py b/testgres/node.py
    HBA_CONF_FILE, \
    RECOVERY_CONF_FILE, \
    PG_LOG_FILE, \
    UTILS_LOG_FILE, \
    DEFAULT_XLOG_METHOD
    UTILS_LOG_FILE

 from .exceptions import \
    CatchUpException,   \
    method_decorator, \
    positional_args_hack

 from .backup import \
    XLogMethod,     \
    NodeBackup


 class NodeStatus(IntEnum):
    """

            return res

    def backup(self, username=None, xlog_method=DEFAULT_XLOG_METHOD):
    def backup(self, username=None, xlog_method=XLogMethod.fetch):
        """
        Perform pg_basebackup.

            A smart object of type NodeBackup.
        """

        from .backup import NodeBackup
        return NodeBackup(node=self,
                          username=username,
                          xlog_method=xlog_method)

    def replicate(self,
                  name=None,
                  username=None,
                  xlog_method=DEFAULT_XLOG_METHOD,
                  xlog_method=XLogMethod.fetch,
                  use_logging=False):
        """
        Create a binary replica of this node.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,12 +5,12 @@
		import tempfile

		from six import raise_from
		from enum import Enum

		from .consts import \
		DATA_DIR, \
		PG_CONF_FILE, \
		BACKUP_LOG_FILE, \
		DEFAULT_XLOG_METHOD
		BACKUP_LOG_FILE

		from .exceptions import BackupException

Expand All		@@ -20,6 +20,16 @@
		execute_utility


		class XLogMethod(Enum):
		"""
		Available WAL methods for NodeBackup
		"""

		none = 'none'
		fetch = 'fetch'
		stream = 'stream'


		class NodeBackup(object):
		"""
		Smart object responsible for backups
Expand All		@@ -33,7 +43,7 @@ def __init__(self,
		node,
		base_dir=None,
		username=None,
		xlog_method=DEFAULT_XLOG_METHOD):
		xlog_method=XLogMethod.fetch):
		"""
		Create a new backup.

Expand All		@@ -47,6 +57,13 @@ def __init__(self,
		if not node.status():
		raise BackupException('Node must be running')

		# Check arguments
		if not isinstance(xlog_method, XLogMethod):
		try:
		xlog_method = XLogMethod(xlog_method)
		except ValueError:
		raise BackupException('Invalid xlog_method "{}"'.format(xlog_method))

		# Set default arguments
		username = username or default_username()
		base_dir = base_dir or tempfile.mkdtemp()
Expand All		@@ -68,7 +85,7 @@ def __init__(self,
		"-h", node.host,
		"-U", username,
		"-D", data_dir,
		"-X", xlog_method
		"-X", xlog_method.value
		]
		execute_utility(_params, self.log_file)

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,6 +12,3 @@
		PG_LOG_FILE = "postgresql.log"
		UTILS_LOG_FILE = "utils.log"
		BACKUP_LOG_FILE = "backup.log"

		# default argument value
		DEFAULT_XLOG_METHOD = "fetch"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,8 +27,7 @@
		HBA_CONF_FILE, \
		RECOVERY_CONF_FILE, \
		PG_LOG_FILE, \
		UTILS_LOG_FILE, \
		DEFAULT_XLOG_METHOD
		UTILS_LOG_FILE

		from .exceptions import \
		CatchUpException, \
Expand All		@@ -52,6 +51,10 @@
		method_decorator, \
		positional_args_hack

		from .backup import \
		XLogMethod, \
		NodeBackup


		class NodeStatus(IntEnum):
		"""
Expand DownExpand Up		@@ -838,7 +841,7 @@ def execute(self,

		return res

		def backup(self, username=None, xlog_method=DEFAULT_XLOG_METHOD):
		def backup(self, username=None, xlog_method=XLogMethod.fetch):
		"""
		Perform pg_basebackup.

Expand All		@@ -850,15 +853,14 @@ def backup(self, username=None, xlog_method=DEFAULT_XLOG_METHOD):
		A smart object of type NodeBackup.
		"""

		from .backup import NodeBackup
		return NodeBackup(node=self,
		username=username,
		xlog_method=xlog_method)

		def replicate(self,
		name=None,
		username=None,
		xlog_method=DEFAULT_XLOG_METHOD,
		xlog_method=XLogMethod.fetch,
		use_logging=False):
		"""
		Create a binary replica of this node.
Expand Down