testgres 1.10.0__tar.gz → 1.10.1__tar.gz

{testgres-1.10.0/testgres.egg-info → testgres-1.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: testgres
-Version: 1.10.0
+Version: 1.10.1
 Summary: Testing utility for PostgreSQL and its extensions
 Home-page: https://github.com/postgrespro/testgres
 Author: Postgres Professional

{testgres-1.10.0 → testgres-1.10.1}/setup.py

@@ -27,7 +27,7 @@ with open('README.md', 'r') as f:
     readme = f.read()
 
 setup(
-    version='1.10.0',
+    version='1.10.1',
     name='testgres',
     packages=['testgres', 'testgres.operations', 'testgres.helpers'],
     description='Testing utility for PostgreSQL and its extensions',

{testgres-1.10.0 → testgres-1.10.1}/testgres/backup.py

@@ -33,7 +33,8 @@ class NodeBackup(object):
                  node,
                  base_dir=None,
                  username=None,
-                 xlog_method=XLogMethod.fetch):
+                 xlog_method=XLogMethod.fetch,
+                 options=None):
         """
         Create a new backup.
 
@@ -43,6 +44,8 @@ class NodeBackup(object):
             username: database user name.
             xlog_method: none | fetch | stream (see docs)
         """
+        if not options:
+            options = []
         self.os_ops = node.os_ops
         if not node.status():
             raise BackupException('Node must be running')
@@ -77,6 +80,7 @@ class NodeBackup(object):
             "-D", data_dir,
             "-X", xlog_method.value
         ]  # yapf: disable
+        _params += options
         execute_utility(_params, self.log_file)
 
     def __enter__(self):

{testgres-1.10.0 → testgres-1.10.1}/testgres/node.py

@@ -726,14 +726,30 @@ class PostgresNode(object):
             "start"
         ] + params  # yapf: disable
 
-        try:
-            exit_status, out, error = execute_utility(_params, self.utils_log_file, verbose=True)
-            if error and 'does not exist' in error:
-                raise Exception
-        except Exception as e:
-            msg = 'Cannot start node'
-            files = self._collect_special_files()
-            raise_from(StartNodeException(msg, files), e)
+        startup_retries = 5
+        while True:
+            try:
+                exit_status, out, error = execute_utility(_params, self.utils_log_file, verbose=True)
+                if error and 'does not exist' in error:
+                    raise Exception
+            except Exception as e:
+                files = self._collect_special_files()
+                if any(len(file) > 1 and 'Is another postmaster already '
+                                         'running on port' in file[1].decode() for
+                       file in files):
+                    print("Detected an issue with connecting to port {0}. "
+                          "Trying another port after a 5-second sleep...".format(self.port))
+                    self.port = reserve_port()
+                    options = {}
+                    options['port'] = str(self.port)
+                    self.set_auto_conf(options)
+                    startup_retries -= 1
+                    time.sleep(5)
+                    continue
+
+                msg = 'Cannot start node'
+                raise_from(StartNodeException(msg, files), e)
+            break
         self._maybe_start_logger()
         self.is_started = True
         return self
@@ -1355,7 +1371,7 @@ class PostgresNode(object):
                 username=None,
                 stdout=None,
                 stderr=None,
-                options=[]):
+                options=None):
         """
         Spawn a pgbench process.
 
@@ -1369,6 +1385,8 @@ class PostgresNode(object):
         Returns:
             Process created by subprocess.Popen.
         """
+        if options is None:
+            options = []
 
         # Set default arguments
         dbname = dbname or default_dbname()
@@ -1388,6 +1406,29 @@ class PostgresNode(object):
 
         return proc
 
+    def pgbench_with_wait(self,
+                          dbname=None,
+                          username=None,
+                          stdout=None,
+                          stderr=None,
+                          options=None):
+        """
+        Do pgbench command and wait.
+
+        Args:
+            dbname: database name to connect to.
+            username: database user name.
+            stdout: stdout file to be used by Popen.
+            stderr: stderr file to be used by Popen.
+            options: additional options for pgbench (list).
+        """
+        if options is None:
+            options = []
+
+        with self.pgbench(dbname, username, stdout, stderr, options) as pgbench:
+            pgbench.wait()
+        return
+
     def pgbench_init(self, **kwargs):
         """
         Small wrapper for pgbench_run().
@@ -1598,7 +1639,7 @@ class PostgresNode(object):
 
         self.os_ops.write(path, auto_conf, truncate=True)
 
-    def upgrade_from(self, old_node):
+    def upgrade_from(self, old_node, options=None):
         """
         Upgrade this node from an old node using pg_upgrade.
 
@@ -1611,6 +1652,9 @@ class PostgresNode(object):
         if not os.path.exists(self.data_dir):
             self.init()
 
+        if not options:
+            options = []
+
         pg_upgrade_binary = self._get_bin_path("pg_upgrade")
 
         if not os.path.exists(pg_upgrade_binary):
@@ -1625,6 +1669,7 @@ class PostgresNode(object):
             "--old-port", str(old_node.port),
             "--new-port", str(self.port),
         ]
+        upgrade_command += options
 
         return self.os_ops.exec_command(upgrade_command)