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

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: testgres_pg_probackup2
-Version: 0.0.4
+Version: 0.0.6
 Summary: Plugin for testgres that manages pg_probackup2
 Home-page: https://github.com/postgrespro/testgres
 Author: Postgres Professional
@@ -9,3 +9,11 @@ License: PostgreSQL
 Keywords: pg_probackup,testing,testgres
 Description-Content-Type: text/markdown
 Requires-Dist: testgres>=1.9.2
+Dynamic: author
+Dynamic: author-email
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: summary

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

@@ -45,6 +45,7 @@ class ProbackupApp:
 
     def __init__(self, test_class: unittest.TestCase,
                  pg_node, pb_log_path, test_env, auto_compress_alg, backup_dir, probackup_path=None):
+        self.process = None
         self.test_class = test_class
         self.pg_node = pg_node
         self.pb_log_path = pb_log_path
@@ -60,8 +61,35 @@ class ProbackupApp:
         self.test_class.output = None
         self.execution_time = None
 
+    def form_daemon_process(self, cmdline, env):
+        def stream_output(stream: subprocess.PIPE) -> None:
+            try:
+                for line in iter(stream.readline, ''):
+                    print(line)
+                    self.test_class.output += line
+            finally:
+                stream.close()
+
+        self.process = subprocess.Popen(
+            cmdline,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True,
+            env=env
+        )
+        logging.info(f"Process started in background with PID: {self.process.pid}")
+
+        if self.process.stdout and self.process.stderr:
+            stdout_thread = threading.Thread(target=stream_output, args=(self.process.stdout,), daemon=True)
+            stderr_thread = threading.Thread(target=stream_output, args=(self.process.stderr,), daemon=True)
+
+            stdout_thread.start()
+            stderr_thread.start()
+
+        return self.process.pid
+
     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):
+            skip_log_directory=False, expect_error=False, use_backup_dir=True, daemonize=False):
         """
         Run pg_probackup
         backup_dir: target directory for making backup
@@ -118,11 +146,14 @@ class ProbackupApp:
                 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')
+            if daemonize:
+                return self.form_daemon_process(cmdline, env)
+            else:
+                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
 

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

@@ -121,8 +121,7 @@ class Init(object):
                     self.probackup_path = probackup_path_tmp
 
         if not self.probackup_path:
-            logging.error('pg_probackup binary is not found')
-            exit(1)
+            raise Exception('pg_probackup binary is not found')
 
         if os.name == 'posix':
             self.EXTERNAL_DIRECTORY_DELIMITER = ':'
@@ -172,6 +171,10 @@ class Init(object):
         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.bckp_source = test_env.get('PG_PROBACKUP_SOURCE', 'pro').lower()
+        if self.bckp_source not in ('base', 'direct', 'pro'):
+            raise Exception("Wrong PG_PROBACKUP_SOURCE value. Available options: base|direct|pro")
+
         self.paranoia = test_env.get('PG_PROBACKUP_PARANOIA', None) == 'ON'
         env_compress = test_env.get('ARCHIVE_COMPRESSION', None)
         if env_compress:
@@ -209,11 +212,15 @@ class Init(object):
         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)
+            raise Exception('Can\'t process pg_probackup version \"{}\": the major version is expected to be a number'.format(self.probackup_version))
 
     def test_env(self):
         return self._test_env.copy()
 
 
-init_params = Init()
+try:
+    init_params = Init()
+except Exception as e:
+    logging.error(str(e))
+    logging.warning("testgres.plugins.probackup2.init_params is set to None.")
+    init_params = None

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

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

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: testgres_pg_probackup2
-Version: 0.0.4
+Version: 0.0.6
 Summary: Plugin for testgres that manages pg_probackup2
 Home-page: https://github.com/postgrespro/testgres
 Author: Postgres Professional
@@ -9,3 +9,11 @@ License: PostgreSQL
 Keywords: pg_probackup,testing,testgres
 Description-Content-Type: text/markdown
 Requires-Dist: testgres>=1.9.2
+Dynamic: author
+Dynamic: author-email
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: summary