tests: minor fixes for "archive" module

Author: gsmolk

tests/archive.py

@@ -240,7 +240,6 @@ def test_pgpro434_3(self):
                 backup_dir, 'node', node,
                 options=[
                     "--archive-timeout=60",
-                    "--stream",
                     "--log-level-file=info"],
                 gdb=True)
 
@@ -253,7 +252,83 @@ def test_pgpro434_3(self):
 
         gdb.continue_execution_until_exit()
 
-        log_file = os.path.join(backup_dir, 'log/pg_probackup.log')
+        log_file = os.path.join(backup_dir, 'log', 'pg_probackup.log')
+        with open(log_file, 'r') as f:
+            log_content = f.read()
+
+        self.assertIn(
+            "ERROR: Switched WAL segment 000000010000000000000002 "
+            "could not be archived in 60 seconds",
+            log_content)
+
+        self.assertIn(
+            "ERROR: Switched WAL segment 000000010000000000000002 "
+            "could not be archived in 60 seconds",
+            log_content)
+
+        log_file = os.path.join(node.logs_dir, 'postgresql.log')
+        with open(log_file, 'r') as f:
+            log_content = f.read()
+
+        self.assertNotIn(
+            'FailedAssertion',
+            log_content,
+            'PostgreSQL crashed because of a failed assert')
+
+        # Clean after yourself
+        self.del_test_dir(module_name, fname)
+
+    # @unittest.skip("skip")
+    def test_pgpro434_4(self):
+        """
+        Check pg_stop_backup_timeout, needed backup_timeout
+        Fixed in commit d84d79668b0c139 and assert fixed by ptrack 1.7
+        """
+        fname = self.id().split('.')[3]
+        backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
+        node = self.make_simple_node(
+            base_dir=os.path.join(module_name, fname, 'node'),
+            set_replication=True,
+            initdb_params=['--data-checksums'])
+
+        self.init_pb(backup_dir)
+        self.add_instance(backup_dir, 'node', node)
+        self.set_archiving(backup_dir, 'node', node)
+
+        node.slow_start()
+
+        gdb = self.backup_node(
+                backup_dir, 'node', node,
+                options=[
+                    "--archive-timeout=60",
+                    "--log-level-file=info"],
+                gdb=True)
+
+        gdb.set_breakpoint('pg_stop_backup')
+        gdb.run_until_break()
+
+        node.append_conf(
+            'postgresql.auto.conf', "archive_command = 'exit 1'")
+        node.reload()
+
+        os.environ["PGAPPNAME"] = "foo"
+
+        pid = node.safe_psql(
+            "postgres",
+            "SELECT pid "
+            "FROM pg_stat_activity "
+            "WHERE application_name = 'pg_probackup'").rstrip()
+
+        os.environ["PGAPPNAME"] = "pg_probackup"
+
+        postgres_gdb = self.gdb_attach(pid)
+        postgres_gdb.set_breakpoint('do_pg_stop_backup')
+        postgres_gdb.continue_execution_until_running()
+
+        gdb.continue_execution_until_exit()
+        # gdb._execute('detach')
+
+        log_file = os.path.join(backup_dir, 'log', 'pg_probackup.log')
         with open(log_file, 'r') as f:
             log_content = f.read()
 

tests/backup.py

@@ -1528,6 +1528,7 @@ def test_backup_with_least_privileges_role(self):
             'postgres',
             'CREATE DATABASE backupdb')
 
+        # PG 9.5
         if self.get_version(node) < 90600:
             node.safe_psql(
                 'backupdb',
@@ -1559,6 +1560,43 @@ def test_backup_with_least_privileges_role(self):
                 "GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup; "
                 "GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;"
             )
+        # PG 9.6
+        elif self.get_version(node) > 90600 and self.get_version(node) < 100000:
+            node.safe_psql(
+                'backupdb',
+                "REVOKE ALL ON DATABASE backupdb from PUBLIC; "
+                "REVOKE ALL ON SCHEMA public from PUBLIC; "
+                "REVOKE ALL ON ALL TABLES IN SCHEMA public FROM PUBLIC; "
+                "REVOKE ALL ON ALL FUNCTIONS IN SCHEMA public FROM PUBLIC; "
+                "REVOKE ALL ON ALL SEQUENCES IN SCHEMA public FROM PUBLIC; "
+                "REVOKE ALL ON SCHEMA pg_catalog from PUBLIC; "
+                "REVOKE ALL ON ALL TABLES IN SCHEMA pg_catalog FROM PUBLIC; "
+                "REVOKE ALL ON ALL FUNCTIONS IN SCHEMA pg_catalog FROM PUBLIC; "
+                "REVOKE ALL ON ALL SEQUENCES IN SCHEMA pg_catalog FROM PUBLIC; "
+                "REVOKE ALL ON SCHEMA information_schema from PUBLIC; "
+                "REVOKE ALL ON ALL TABLES IN SCHEMA information_schema FROM PUBLIC; "
+                "REVOKE ALL ON ALL FUNCTIONS IN SCHEMA information_schema FROM PUBLIC; "
+                "REVOKE ALL ON ALL SEQUENCES IN SCHEMA information_schema FROM PUBLIC; "
+                "CREATE ROLE backup WITH LOGIN REPLICATION; "
+                "GRANT CONNECT ON DATABASE backupdb to backup; "
+                "GRANT USAGE ON SCHEMA pg_catalog TO backup; "
+                "GRANT SELECT ON TABLE pg_catalog.pg_proc TO backup; "
+                "GRANT SELECT ON TABLE pg_catalog.pg_database TO backup; " # for partial restore, checkdb and ptrack
+                "GRANT EXECUTE ON FUNCTION pg_catalog.nameeq(name, name) TO backup; "
+                "GRANT EXECUTE ON FUNCTION pg_catalog.textout(text) TO backup; "
+                "GRANT EXECUTE ON FUNCTION pg_catalog.timestamptz(timestamp with time zone, integer) TO backup; "
+                "GRANT EXECUTE ON FUNCTION pg_catalog.current_setting(text) TO backup; "
+                "GRANT EXECUTE ON FUNCTION pg_catalog.pg_is_in_recovery() TO backup; "
+                "GRANT EXECUTE ON FUNCTION pg_catalog.pg_control_system() TO backup; "
+                "GRANT EXECUTE ON FUNCTION pg_catalog.pg_start_backup(text, boolean, boolean) TO backup; "
+                "GRANT EXECUTE ON FUNCTION pg_catalog.pg_stop_backup(boolean) TO backup; "
+                "GRANT EXECUTE ON FUNCTION pg_catalog.pg_create_restore_point(text) TO backup; "
+                "GRANT EXECUTE ON FUNCTION pg_catalog.pg_switch_xlog() TO backup; "
+                "GRANT EXECUTE ON FUNCTION pg_catalog.pg_last_xlog_replay_location() TO backup; "
+                "GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup; "
+                "GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;"
+            )
+        # >= 10
         else:
             node.safe_psql(
                 'backupdb',
@@ -1595,17 +1633,18 @@ def test_backup_with_least_privileges_role(self):
 
         if self.ptrack:
             for fname in [
-                    'oideq(oid, oid)',
-                    'ptrack_version()',
-                    'pg_ptrack_clear()',
-                    'pg_ptrack_control_lsn()',
-                    'pg_ptrack_get_and_clear_db(oid, oid)',
-                    'pg_ptrack_get_and_clear(oid, oid)',
-                    'pg_ptrack_get_block_2(oid, oid, oid, bigint)']:
+                    'pg_catalog.oideq(oid, oid)',
+                    'pg_catalog.ptrack_version()',
+                    'pg_catalog.pg_ptrack_clear()',
+                    'pg_catalog.pg_ptrack_control_lsn()',
+                    'pg_catalog.pg_ptrack_get_and_clear_db(oid, oid)',
+                    'pg_catalog.pg_ptrack_get_and_clear(oid, oid)',
+                    'pg_catalog.pg_ptrack_get_block_2(oid, oid, oid, bigint)',
+                    'pg_catalog.pg_stop_backup()']:
                 # try:
                 node.safe_psql(
                     "backupdb",
-                    "GRANT EXECUTE ON FUNCTION pg_catalog.{0} "
+                    "GRANT EXECUTE ON FUNCTION {0} "
                     "TO backup".format(fname))
                 # except:
                 #     pass

tests/helpers/ptrack_helpers.py

@@ -279,6 +279,8 @@ def __init__(self, *args, **kwargs):
             if self.test_env['PG_PROBACKUP_PTRACK'] == 'ON':
                 self.ptrack = True
 
+        os.environ["PGAPPNAME"] = "pg_probackup"
+
     @property
     def pg_config_version(self):
         return self.version_to_num(

tests/replica.py

@@ -18,6 +18,9 @@ def test_replica_stream_ptrack_backup(self):
         make node, take full backup, restore it and make replica from it,
         take full stream backup from replica
         """
+        if not self.ptrack:
+            return unittest.skip('Skipped because ptrack support is disabled')
+
         fname = self.id().split('.')[3]
         backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
         master = self.make_simple_node(