Merge commit 'e78e1eb9d45f09775a78fbf1ccce6153e94c1fe6' into PGPRO10

Author: vbwagner

contrib/pg_probackup/src/backup.c

@@ -1165,7 +1165,8 @@ pg_ptrack_support(void)
 	}
 
 	/* Now we support only ptrack versions upper than 1.5 */
-	if (strverscmp(PQgetvalue(res_db, 0, 0), "1.5") < 0)
+	if (strcmp(PQgetvalue(res_db, 0, 0), "1.5") != 0 &&
+		strcmp(PQgetvalue(res_db, 0, 0), "1.6") != 0)
 	{
 		elog(WARNING, "Update your ptrack to the version 1.5 or upper. Current version is %s", PQgetvalue(res_db, 0, 0));
 		PQclear(res_db);

contrib/pg_probackup/tests/archive.py

@@ -44,8 +44,7 @@ def test_pgpro434_1(self):
         node.cleanup()
 
         self.restore_node(
-            backup_dir, 'node', node,
-            options=["--recovery-target-action=promote"])
+            backup_dir, 'node', node)
         node.start()
         while node.safe_psql(
             "postgres",
@@ -659,8 +658,7 @@ def test_master_and_replica_concurrent_archiving(self):
 
         # Settings for Replica
         self.restore_node(
-            backup_dir, 'master', replica,
-            options=['--recovery-target-action=promote'])
+            backup_dir, 'master', replica)
         # CHECK PHYSICAL CORRECTNESS on REPLICA
         pgdata_replica = self.pgdata_content(replica.data_dir)
         self.compare_pgdata(pgdata_master, pgdata_replica)

contrib/pg_probackup/tests/exclude.py

@@ -11,14 +11,19 @@ class ExcludeTest(ProbackupTest, unittest.TestCase):
     # @unittest.skip("skip")
     # @unittest.expectedFailure
     def test_exclude_temp_tables(self):
-        """make node without archiving, create temp table, take full backup, check that temp table not present in backup catalogue"""
+        """
+        make node without archiving, create temp table, take full backup,
+        check that temp table not present in backup catalogue
+        """
         fname = self.id().split('.')[3]
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
-        node = self.make_simple_node(base_dir="{0}/{1}/node".format(module_name, fname),
+        node = self.make_simple_node(
+            base_dir="{0}/{1}/node".format(module_name, fname),
             set_replication=True,
             initdb_params=['--data-checksums'],
-            pg_options={'wal_level': 'replica', 'max_wal_senders': '2', 'shared_buffers': '1GB',
-            "fsync": "off", 'ptrack_enable': 'on'}
+            pg_options={
+                'wal_level': 'replica', 'max_wal_senders': '2',
+                'shared_buffers': '1GB', 'fsync': 'off', 'ptrack_enable': 'on'}
             )
 
         self.init_pb(backup_dir)
@@ -28,10 +33,14 @@ def test_exclude_temp_tables(self):
         conn = node.connect()
         with node.connect("postgres") as conn:
 
-            conn.execute("create temp table test as select generate_series(0,50050000)::text")
+            conn.execute(
+                "create temp table test as "
+                "select generate_series(0,50050000)::text")
             conn.commit()
 
-            temp_schema_name = conn.execute("SELECT nspname FROM pg_namespace WHERE oid = pg_my_temp_schema()")[0][0]
+            temp_schema_name = conn.execute(
+                "SELECT nspname FROM pg_namespace "
+                "WHERE oid = pg_my_temp_schema()")[0][0]
             conn.commit()
 
             temp_toast_schema_name = "pg_toast_" + temp_schema_name.replace("pg_", "")
@@ -60,18 +69,24 @@ def test_exclude_temp_tables(self):
         temp_toast_filename = os.path.basename(toast_path)
         temp_idx_toast_filename = os.path.basename(toast_idx_path)
 
-        self.backup_node(backup_dir, 'node', node, backup_type='full', options=['--stream'])
+        self.backup_node(
+            backup_dir, 'node', node, backup_type='full', options=['--stream'])
 
         for root, dirs, files in os.walk(backup_dir):
             for file in files:
-                if file in [temp_table_filename, temp_table_filename + ".1",
-                 temp_idx_filename,
-                 temp_idx_filename + ".1",
-                 temp_toast_filename,
-                 temp_toast_filename + ".1",
-                 temp_idx_toast_filename,
-                 temp_idx_toast_filename + ".1"]:
-                    self.assertEqual(1, 0, "Found temp table file in backup catalogue.\n Filepath: {0}".format(file))
+                if file in [
+                    temp_table_filename, temp_table_filename + ".1",
+                    temp_idx_filename,
+                    temp_idx_filename + ".1",
+                    temp_toast_filename,
+                    temp_toast_filename + ".1",
+                    temp_idx_toast_filename,
+                    temp_idx_toast_filename + ".1"
+                        ]:
+                    self.assertEqual(
+                        1, 0,
+                        "Found temp table file in backup catalogue.\n "
+                        "Filepath: {0}".format(file))
 
         # Clean after yourself
         self.del_test_dir(module_name, fname)
@@ -92,7 +107,7 @@ def test_exclude_unlogged_tables_1(self):
             pg_options={
                 'wal_level': 'replica',
                 'max_wal_senders': '2',
-                "shared_buffers": "1GB",
+                "shared_buffers": "10MB",
                 "fsync": "off",
                 'ptrack_enable': 'on'}
             )