testgres-pg-probackup2 0.8.1__tar.gz → 0.9.0__tar.gz

{testgres_pg_probackup2-0.8.1 → testgres_pg_probackup2-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testgres_pg_probackup2
-Version: 0.8.1
+Version: 0.9.0
 Summary: Plugin for testgres that manages pg_probackup2
 Home-page: https://github.com/postgrespro/testgres
 Author: Postgres Professional
@@ -8,9 +8,10 @@ Author-email: testgres@postgrespro.ru
 License: PostgreSQL
 Keywords: pg_probackup,testing,testgres
 Description-Content-Type: text/markdown
-Requires-Dist: testgres>=1.9.2
-Requires-Dist: zstd
 Requires-Dist: lz4
+Requires-Dist: pefile
+Requires-Dist: testgres>=1.14.4
+Requires-Dist: zstd
 Dynamic: author
 Dynamic: author-email
 Dynamic: description-content-type

{testgres_pg_probackup2-0.8.1 → testgres_pg_probackup2-0.9.0}/pg_probackup2/init_helpers.py

@@ -2,11 +2,14 @@ import logging
 from functools import reduce
 import getpass
 import os
+import pefile
 import re
 import shutil
 import subprocess
 import sys
+import traceback
 import testgres
+from testgres.operations.exceptions import InvalidOperationException
 
 try:
     import lz4.frame  # noqa: F401
@@ -42,16 +45,55 @@ class Init(object):
         else:
             self.verbose = False
 
-        self._pg_config = testgres.get_pg_config()
-        self.is_enterprise = self._pg_config.get('PGPRO_EDITION', None) == 'enterprise'
-        self.is_shardman = self._pg_config.get('PGPRO_EDITION', None) == 'shardman'
-        self.is_pgpro = 'PGPRO_EDITION' in self._pg_config
-        self.is_nls_enabled = 'enable-nls' in self._pg_config['CONFIGURE']
-        self.is_lz4_enabled = '-llz4' in self._pg_config['LIBS']
-        version = self._pg_config['VERSION'].rstrip('develalphabetapre')
-        parts = [*version.split(' ')[1].split('.'), '0', '0'][:3]
+        os_ops = testgres.LocalOperations()
+        os_name = os_ops.get_name()
+
+        pg_bin = testgres.get_bin_dir(os_ops)
+        if pg_bin is None:
+            raise InvalidOperationException(
+                "Failed to determine the Postgres binary directory. Specify the path to the directory in PG_BIN or put it into the system PATH.")
+        postgres = os_ops.build_path(pg_bin, 'postgres.exe' if os_name == 'nt' else 'postgres')
+
+        pgpro_edition = os_ops.exec_command(
+            [postgres, "-C", "pgpro_edition"],
+            encoding='utf-8',
+            ignore_errors=True).rstrip()
+        self.is_enterprise = pgpro_edition == 'enterprise'
+        self.is_shardman = pgpro_edition == 'shardman'
+        self.is_pgpro = pgpro_edition != ''
+
+        # TODO: Always test with NLS support and remove this flag
+        self.is_nls_enabled = True
+
+        if os_name == 'posix':
+            ldd = os_ops.exec_command(
+                ['ldd', postgres],
+                encoding='utf-8')
+            self.is_lz4_enabled = 'liblz4.so' in ldd
+        elif os_name == 'nt':
+            pe = pefile.PE(postgres, fast_load=True)
+            pe.parse_data_directories(directories=[
+                pefile.DIRECTORY_ENTRY['IMAGE_DIRECTORY_ENTRY_IMPORT']])
+            self.is_lz4_enabled = False
+            for entry in pe.DIRECTORY_ENTRY_IMPORT:
+                if entry.dll.decode('utf-8') == 'liblz4.dll':
+                    self.is_lz4_enabled = True
+                    break
+        else:
+            # Fall back to trying to determine lz4 support via pg_config
+            pg_config = testgres.get_pg_config(os_ops=os_ops)
+            self.is_lz4_enabled = '-llz4' in pg_config['LIBS']
+
+        server_version_out = os_ops.exec_command(
+            [postgres, "-C", "server_version"],
+            encoding='utf-8')
+        server_version = testgres.parse_pg_version(server_version_out)
+        parts = [*server_version.split('.'), '0', '0'][:3]
         parts[0] = re.match(r'\d+', parts[0]).group()
-        self.pg_config_version = reduce(lambda v, x: v * 100 + int(x), parts, 0)
+        # Server_version consists of two fields (x.y) so num_version always ends with 00
+        num_version = reduce(lambda v, x: v * 100 + int(x), parts, 0)
+        # For backward compatibility
+        self.pg_config_version = num_version
 
         os.environ['LANGUAGE'] = 'en'   # set default locale language to en. All messages will use this locale
         test_env = os.environ.copy()
@@ -101,8 +143,7 @@ class Init(object):
                         test_env["PGPROBACKUPBIN"]))
 
         if not self.probackup_path:
-            probackup_path_tmp = os.path.join(
-                testgres.get_pg_config()['BINDIR'], 'pg_probackup')
+            probackup_path_tmp = os_ops.build_path(pg_bin, 'pg_probackup')
 
             if os.path.isfile(probackup_path_tmp):
                 if not os.access(probackup_path_tmp, os.X_OK):
@@ -124,12 +165,12 @@ class Init(object):
         if not self.probackup_path:
             raise Exception('pg_probackup binary is not found')
 
-        if os.name == 'posix':
+        if os_name == 'posix':
             self.EXTERNAL_DIRECTORY_DELIMITER = ':'
             os.environ['PATH'] = os.path.dirname(
                 self.probackup_path) + ':' + os.environ['PATH']
 
-        elif os.name == 'nt':
+        elif os_name == 'nt':
             self.EXTERNAL_DIRECTORY_DELIMITER = ';'
             os.environ['PATH'] = os.path.dirname(
                 self.probackup_path) + ';' + os.environ['PATH']
@@ -169,7 +210,7 @@ class Init(object):
             self.old_probackup_version = match.group(0) if match else None
 
         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.ptrack = test_env.get('PG_PROBACKUP_PTRACK', None) == 'ON' and num_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()
@@ -225,6 +266,7 @@ class Init(object):
 try:
     init_params = Init()
 except Exception as e:
+    traceback.print_exc(file=sys.stderr)
     logging.error(str(e))
     logging.warning("testgres.plugins.probackup2.init_params is set to None.")
     init_params = None

{testgres_pg_probackup2-0.8.1 → testgres_pg_probackup2-0.9.0}/setup.py

@@ -4,7 +4,7 @@ except ImportError:
     from distutils.core import setup
 
 setup(
-    version='0.8.1',
+    version='0.9.0',
     name='testgres_pg_probackup2',
     packages=['pg_probackup2', 'pg_probackup2.storage'],
     description='Plugin for testgres that manages pg_probackup2',
@@ -14,5 +14,10 @@ setup(
     author='Postgres Professional',
     author_email='testgres@postgrespro.ru',
     keywords=['pg_probackup', 'testing', 'testgres'],
-    install_requires=['testgres>=1.9.2', 'zstd', 'lz4']
+    install_requires=[
+        'lz4',
+        'pefile',
+        'testgres>=1.14.4',
+        'zstd'
+    ]
 )

{testgres_pg_probackup2-0.8.1 → testgres_pg_probackup2-0.9.0}/testgres_pg_probackup2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: testgres_pg_probackup2
-Version: 0.8.1
+Version: 0.9.0
 Summary: Plugin for testgres that manages pg_probackup2
 Home-page: https://github.com/postgrespro/testgres
 Author: Postgres Professional
@@ -8,9 +8,10 @@ Author-email: testgres@postgrespro.ru
 License: PostgreSQL
 Keywords: pg_probackup,testing,testgres
 Description-Content-Type: text/markdown
-Requires-Dist: testgres>=1.9.2
-Requires-Dist: zstd
 Requires-Dist: lz4
+Requires-Dist: pefile
+Requires-Dist: testgres>=1.14.4
+Requires-Dist: zstd
 Dynamic: author
 Dynamic: author-email
 Dynamic: description-content-type

testgres_pg_probackup2-0.9.0/testgres_pg_probackup2.egg-info/requires.txt

@@ -0,0 +1,4 @@
+lz4
+pefile
+testgres>=1.14.4
+zstd

testgres_pg_probackup2-0.8.1/testgres_pg_probackup2.egg-info/requires.txt

@@ -1,3 +0,0 @@
-testgres>=1.9.2
-zstd
-lz4