testgres-pg-probackup2 0.0.2__tar.gz → 0.0.4__tar.gz

{testgres_pg_probackup2-0.0.2 → testgres_pg_probackup2-0.0.4}/PKG-INFO

@@ -1,14 +1,11 @@
 Metadata-Version: 2.1
 Name: testgres_pg_probackup2
-Version: 0.0.2
+Version: 0.0.4
 Summary: Plugin for testgres that manages pg_probackup2
 Home-page: https://github.com/postgrespro/testgres
 Author: Postgres Professional
 Author-email: testgres@postgrespro.ru
 License: PostgreSQL
 Keywords: pg_probackup,testing,testgres
-Platform: UNKNOWN
 Description-Content-Type: text/markdown
-
-UNKNOWN
-
+Requires-Dist: testgres>=1.9.2

{testgres_pg_probackup2-0.0.2 → testgres_pg_probackup2-0.0.4}/pg_probackup2/app.py

@@ -1,6 +1,7 @@
 import contextlib
 import importlib
 import json
+import logging
 import os
 import re
 import subprocess
@@ -43,19 +44,21 @@ fs_backup_class = FSTestBackupDir
 class ProbackupApp:
 
     def __init__(self, test_class: unittest.TestCase,
-                 pg_node, pb_log_path, test_env, auto_compress_alg, backup_dir):
+                 pg_node, pb_log_path, test_env, auto_compress_alg, backup_dir, probackup_path=None):
         self.test_class = test_class
         self.pg_node = pg_node
         self.pb_log_path = pb_log_path
         self.test_env = test_env
         self.auto_compress_alg = auto_compress_alg
         self.backup_dir = backup_dir
-        self.probackup_path = init_params.probackup_path
+        self.probackup_path = probackup_path or init_params.probackup_path
         self.probackup_old_path = init_params.probackup_old_path
         self.remote = init_params.remote
+        self.wal_tree_enabled = init_params.wal_tree_enabled
         self.verbose = init_params.verbose
         self.archive_compress = init_params.archive_compress
         self.test_class.output = None
+        self.execution_time = None
 
     def run(self, command, gdb=False, old_binary=False, return_id=True, env=None,
             skip_log_directory=False, expect_error=False, use_backup_dir=True):
@@ -71,9 +74,11 @@ class ProbackupApp:
             command = [command[0], *use_backup_dir.pb_args, *command[1:]]
         elif use_backup_dir:
             command = [command[0], *self.backup_dir.pb_args, *command[1:]]
+        else:
+            command = [command[0], *self.backup_dir.pb_args[2:], *command[1:]]
 
         if not self.probackup_old_path and old_binary:
-            print('PGPROBACKUPBIN_OLD is not set')
+            logging.error('PGPROBACKUPBIN_OLD is not set')
             exit(1)
 
         if old_binary:
@@ -106,23 +111,23 @@ class ProbackupApp:
             return GDBobj(cmdline, self.test_class)
 
         try:
-            result = None
             if type(gdb) is tuple and gdb[0] == 'suspend':
                 # special test flow for manually debug probackup
                 gdb_port = gdb[1]
                 cmdline = ['gdbserver'] + ['localhost:' + str(gdb_port)] + cmdline
-                print("pg_probackup gdb suspended, waiting gdb connection on localhost:{0}".format(gdb_port))
+                logging.warning("pg_probackup gdb suspended, waiting gdb connection on localhost:{0}".format(gdb_port))
 
+            start_time = time.time()
             self.test_class.output = subprocess.check_output(
                 cmdline,
                 stderr=subprocess.STDOUT,
                 env=env
             ).decode('utf-8', errors='replace')
+            end_time = time.time()
+            self.execution_time = end_time - start_time
+
             if command[0] == 'backup' and return_id:
-                # return backup ID
-                for line in self.test_class.output.splitlines():
-                    if 'INFO: Backup' and 'completed' in line:
-                        result = line.split()[2]
+                result = self.get_backup_id()
             else:
                 result = self.test_class.output
             if expect_error is True:
@@ -139,6 +144,19 @@ class ProbackupApp:
             else:
                 raise ProbackupException(self.test_class.output, self.test_class.cmd)
 
+    def get_backup_id(self):
+        if init_params.major_version > 2:
+            pattern = re.compile(r"Backup (.*) completed successfully.")
+            for line in self.test_class.output.splitlines():
+                match = pattern.search(line)
+                if match:
+                    return match.group(1)
+        else:
+            for line in self.test_class.output.splitlines():
+                if 'INFO: Backup' and 'completed' in line:
+                    return line.split()[2]
+        return None
+
     def init(self, options=None, old_binary=False, skip_log_directory=False, expect_error=False, use_backup_dir=True):
         if options is None:
             options = []
@@ -149,13 +167,19 @@ class ProbackupApp:
                         use_backup_dir=use_backup_dir
                         )
 
-    def add_instance(self, instance, node, old_binary=False, options=None, expect_error=False):
+    def add_instance(self, instance, node, old_binary=False, options=None, expect_error=False, datname=False):
         if options is None:
             options = []
+
+        if not datname:
+            datname = 'postgres'
+
         cmd = [
             'add-instance',
             '--instance={0}'.format(instance),
-            '-D', node.data_dir
+            '-D', node.data_dir,
+            '--pgport', '%i' % node.port,
+            '--pgdatabase', datname
         ]
 
         # don`t forget to kill old_binary after remote ssh release
@@ -164,6 +188,9 @@ class ProbackupApp:
                 '--remote-proto=ssh',
                 '--remote-host=localhost']
 
+        if self.wal_tree_enabled:
+            options = options + ['--wal-tree']
+
         return self.run(cmd + options, old_binary=old_binary, expect_error=expect_error)
 
     def set_config(self, instance, old_binary=False, options=None, expect_error=False):
@@ -212,7 +239,7 @@ class ProbackupApp:
         if options is None:
             options = []
         if not node and not data_dir:
-            print('You must provide ether node or data_dir for backup')
+            logging.error('You must provide ether node or data_dir for backup')
             exit(1)
 
         if not datname:
@@ -367,6 +394,7 @@ class ProbackupApp:
             backup_mode, source_pgdata, destination_node,
             options=None,
             remote_host='localhost',
+            remote_port=None,
             expect_error=False,
             gdb=False
     ):
@@ -380,7 +408,9 @@ class ProbackupApp:
             '--destination-pgdata={0}'.format(destination_node.data_dir)
         ]
         if self.remote:
-            cmd_list += ['--remote-proto=ssh', '--remote-host=%s' % remote_host]
+            cmd_list += ['--remote-proto=ssh', f'--remote-host={remote_host}']
+            if remote_port:
+                cmd_list.append(f'--remote-port={remote_port}')
         if self.verbose:
             cmd_list += [
                 '--log-level-file=VERBOSE',
@@ -478,7 +508,7 @@ class ProbackupApp:
                         if i == '':
                             backup_record_split.remove(i)
                     if len(header_split) != len(backup_record_split):
-                        print(warning.format(
+                        logging.error(warning.format(
                             header=header, body=body,
                             header_split=header_split,
                             body_split=backup_record_split)
@@ -557,7 +587,7 @@ class ProbackupApp:
         else:
             show_splitted = self.run(cmd_list + options, old_binary=old_binary,
                                      expect_error=expect_error).splitlines()
-            print(show_splitted)
+            logging.error(show_splitted)
             exit(1)
 
     def validate(
@@ -681,9 +711,13 @@ class ProbackupApp:
             if overwrite:
                 archive_command += ' --overwrite'
 
-            archive_command += ' --log-level-console=VERBOSE'
-            archive_command += ' -j 5'
-            archive_command += ' --batch-size 10'
+            if init_params.major_version > 2:
+                archive_command += ' --log-level-console=trace'
+            else:
+                archive_command += ' --log-level-console=VERBOSE'
+                archive_command += ' -j 5'
+                archive_command += ' --batch-size 10'
+
             archive_command += ' --no-sync'
 
             if archive_timeout:
@@ -745,7 +779,7 @@ class ProbackupApp:
         if fs_type:
             implementation = fs_type
 
-        print("Using ", implementation)
+        logging.info("Using ", implementation)
         module_name, class_name = implementation.rsplit(sep='.', maxsplit=1)
 
         module = importlib.import_module(module_name)

{testgres_pg_probackup2-0.0.2 → testgres_pg_probackup2-0.0.4}/pg_probackup2/gdb.py

@@ -37,7 +37,7 @@ class GDBobj:
                                    " to run GDB tests")
             raise GdbException("No gdb usage possible.")
 
-        # Check gdb presense
+        # Check gdb presence
         try:
             gdb_version, _ = subprocess.Popen(
                 ['gdb', '--version'],
@@ -108,6 +108,9 @@ class GDBobj:
         self.proc.stdin.close()
         self.proc.stdout.close()
 
+    def terminate_subprocess(self):
+        self._execute('kill')
+
     def set_breakpoint(self, location):
 
         result = self._execute('break ' + location)

{testgres_pg_probackup2-0.0.2 → testgres_pg_probackup2-0.0.4}/pg_probackup2/init_helpers.py

@@ -1,3 +1,4 @@
+import logging
 from functools import reduce
 import getpass
 import os
@@ -31,7 +32,7 @@ try:
         cached_initdb_dir=False,
         node_cleanup_full=delete_logs)
 except Exception as e:
-    print("Can't configure testgres: {0}".format(e))
+    logging.warning("Can't configure testgres: {0}".format(e))
 
 
 class Init(object):
@@ -104,7 +105,7 @@ class Init(object):
 
             if os.path.isfile(probackup_path_tmp):
                 if not os.access(probackup_path_tmp, os.X_OK):
-                    print('{0} is not an executable file'.format(
+                    logging.warning('{0} is not an executable file'.format(
                         probackup_path_tmp))
                 else:
                     self.probackup_path = probackup_path_tmp
@@ -114,13 +115,13 @@ class Init(object):
 
             if os.path.isfile(probackup_path_tmp):
                 if not os.access(probackup_path_tmp, os.X_OK):
-                    print('{0} is not an executable file'.format(
+                    logging.warning('{0} is not an executable file'.format(
                         probackup_path_tmp))
                 else:
                     self.probackup_path = probackup_path_tmp
 
         if not self.probackup_path:
-            print('pg_probackup binary is not found')
+            logging.error('pg_probackup binary is not found')
             exit(1)
 
         if os.name == 'posix':
@@ -169,6 +170,7 @@ class Init(object):
 
         self.remote = test_env.get('PGPROBACKUP_SSH_REMOTE', None) == 'ON'
         self.ptrack = test_env.get('PG_PROBACKUP_PTRACK', None) == 'ON' and self.pg_config_version >= 110000
+        self.wal_tree_enabled = test_env.get('PG_PROBACKUP_WAL_TREE_ENABLED', None) == 'ON'
 
         self.paranoia = test_env.get('PG_PROBACKUP_PARANOIA', None) == 'ON'
         env_compress = test_env.get('ARCHIVE_COMPRESSION', None)
@@ -204,6 +206,12 @@ class Init(object):
         os.environ["PGAPPNAME"] = "pg_probackup"
         self.delete_logs = delete_logs
 
+        if self.probackup_version.split('.')[0].isdigit():
+            self.major_version = int(self.probackup_version.split('.')[0])
+        else:
+            logging.error('Can\'t process pg_probackup version \"{}\": the major version is expected to be a number'.format(self.probackup_version))
+            sys.exit(1)
+
     def test_env(self):
         return self._test_env.copy()
 

{testgres_pg_probackup2-0.0.2 → testgres_pg_probackup2-0.0.4}/setup.py

@@ -4,7 +4,7 @@ except ImportError:
     from distutils.core import setup
 
 setup(
-    version='0.0.2',
+    version='0.0.4',
     name='testgres_pg_probackup2',
     packages=['pg_probackup2', 'pg_probackup2.storage'],
     description='Plugin for testgres that manages pg_probackup2',

{testgres_pg_probackup2-0.0.2 → testgres_pg_probackup2-0.0.4}/testgres_pg_probackup2.egg-info/PKG-INFO

@@ -1,14 +1,11 @@
 Metadata-Version: 2.1
-Name: testgres-pg-probackup2
-Version: 0.0.2
+Name: testgres_pg_probackup2
+Version: 0.0.4
 Summary: Plugin for testgres that manages pg_probackup2
 Home-page: https://github.com/postgrespro/testgres
 Author: Postgres Professional
 Author-email: testgres@postgrespro.ru
 License: PostgreSQL
 Keywords: pg_probackup,testing,testgres
-Platform: UNKNOWN
 Description-Content-Type: text/markdown
-
-UNKNOWN
-
+Requires-Dist: testgres>=1.9.2