tests: minor fixes

Author: gsmolk

Diff for: tests/compatibility.py

@@ -311,3 +311,162 @@ def test_backward_compatibility_ptrack(self):
         if self.paranoia:
             pgdata_restored = self.pgdata_content(node_restored.data_dir)
             self.compare_pgdata(pgdata, pgdata_restored)
+
+    # @unittest.expectedFailure
+    # @unittest.skip("skip")
+    def test_backward_compatibility_compression(self):
+        """Description in jira issue PGPRO-434"""
+        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),
+            set_replication=True,
+            initdb_params=['--data-checksums'],
+            pg_options={
+                'max_wal_senders': '2',
+                'autovacuum': 'off'})
+
+        self.init_pb(backup_dir, old_binary=True)
+        self.add_instance(backup_dir, 'node', node, old_binary=True)
+
+        self.set_archiving(backup_dir, 'node', node, old_binary=True)
+        node.slow_start()
+
+        node.pgbench_init(scale=10)
+
+        # FULL backup with OLD binary
+        backup_id = self.backup_node(
+            backup_dir, 'node', node,
+            old_binary=True,
+            options=['--compress'])
+
+        if self.paranoia:
+            pgdata = self.pgdata_content(node.data_dir)
+
+        # restore OLD FULL with new binary
+        node_restored = self.make_simple_node(
+            base_dir="{0}/{1}/node_restored".format(module_name, fname))
+
+        node_restored.cleanup()
+
+        self.restore_node(
+                backup_dir, 'node', node_restored,
+                options=["-j", "4"])
+
+        if self.paranoia:
+            pgdata_restored = self.pgdata_content(node_restored.data_dir)
+            self.compare_pgdata(pgdata, pgdata_restored)
+
+        # PAGE backup with OLD binary
+        pgbench = node.pgbench(
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            options=["-c", "4", "-T", "10"])
+        pgbench.wait()
+        pgbench.stdout.close()
+
+        self.backup_node(
+            backup_dir, 'node', node,
+            backup_type='page',
+            old_binary=True,
+            options=['--compress'])
+
+        if self.paranoia:
+            pgdata = self.pgdata_content(node.data_dir)
+
+        node_restored.cleanup()
+        self.restore_node(
+            backup_dir, 'node', node_restored,
+            options=["-j", "4"])
+
+        if self.paranoia:
+            pgdata_restored = self.pgdata_content(node_restored.data_dir)
+            self.compare_pgdata(pgdata, pgdata_restored)
+
+        # PAGE backup with new binary
+        pgbench = node.pgbench(
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            options=["-c", "4", "-T", "10"])
+        pgbench.wait()
+        pgbench.stdout.close()
+
+        self.backup_node(
+            backup_dir, 'node', node,
+            backup_type='page',
+            options=['--compress'])
+
+        if self.paranoia:
+            pgdata = self.pgdata_content(node.data_dir)
+
+        node_restored.cleanup()
+
+        self.restore_node(
+            backup_dir, 'node', node_restored,
+            options=["-j", "4"])
+
+        if self.paranoia:
+            pgdata_restored = self.pgdata_content(node_restored.data_dir)
+            self.compare_pgdata(pgdata, pgdata_restored)
+
+        # Delta backup with old binary
+        self.delete_pb(backup_dir, 'node', backup_id)
+
+        self.backup_node(
+            backup_dir, 'node', node,
+            old_binary=True,
+            options=['--compress'])
+
+        pgbench = node.pgbench(
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            options=["-c", "4", "-T", "10"])
+
+        pgbench.wait()
+        pgbench.stdout.close()
+
+        self.backup_node(
+            backup_dir, 'node', node,
+            backup_type='delta',
+            options=['--compress'],
+            old_binary=True)
+
+        if self.paranoia:
+            pgdata = self.pgdata_content(node.data_dir)
+
+        node_restored.cleanup()
+
+        self.restore_node(
+            backup_dir, 'node', node_restored,
+            options=["-j", "4"])
+
+        if self.paranoia:
+            pgdata_restored = self.pgdata_content(node_restored.data_dir)
+            self.compare_pgdata(pgdata, pgdata_restored)
+
+        # Delta backup with new binary
+        pgbench = node.pgbench(
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            options=["-c", "4", "-T", "10"])
+
+        pgbench.wait()
+        pgbench.stdout.close()
+
+        self.backup_node(
+            backup_dir, 'node', node,
+            backup_type='delta',
+            options=['--compress'])
+
+        if self.paranoia:
+            pgdata = self.pgdata_content(node.data_dir)
+
+        node_restored.cleanup()
+
+        self.restore_node(
+            backup_dir, 'node', node_restored,
+            options=["-j", "4"])
+
+        if self.paranoia:
+            pgdata_restored = self.pgdata_content(node_restored.data_dir)
+            self.compare_pgdata(pgdata, pgdata_restored)

Diff for: tests/compression.py

@@ -494,3 +494,70 @@ def test_compression_wrong_algorithm(self):
 
         # Clean after yourself
         self.del_test_dir(module_name, fname)
+
+    @unittest.skip("skip")
+    def test_uncompressable_pages(self):
+        """
+        make archive node, create table with uncompressable toast pages,
+        take backup with compression, make sure that page was not compressed,
+        restore backup and check data correctness
+        """
+        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),
+            set_replication=True,
+            initdb_params=['--data-checksums'],
+            pg_options={
+                'wal_level': 'replica',
+                'max_wal_senders': '2',
+                'checkpoint_timeout': '30s'}
+            )
+
+        self.init_pb(backup_dir)
+        self.add_instance(backup_dir, 'node', node)
+        self.set_archiving(backup_dir, 'node', node)
+        node.slow_start()
+
+#        node.safe_psql(
+#            "postgres",
+#            "create table t_heap as select i, "
+#            "repeat('1234567890abcdefghiyklmn', 1)::bytea, "
+#            "point(0,0) from generate_series(0,1) i")
+
+        node.safe_psql(
+            "postgres",
+            "create table t as select i, "
+            "repeat(md5(i::text),5006056) as fat_attr "
+            "from generate_series(0,10) i;")
+
+        self.backup_node(
+            backup_dir, 'node', node,
+            backup_type='full',
+            options=[
+                '--compress',
+                '--log-level-file=verbose'])
+
+        node.cleanup()
+
+        self.restore_node(backup_dir, 'node', node)
+        node.slow_start()
+
+        self.backup_node(
+            backup_dir, 'node', node,
+            backup_type='full',
+            options=[
+                '--compress',
+                '--log-level-file=verbose'])
+
+        # Clean after yourself
+        # self.del_test_dir(module_name, fname)
+
+# create table t as select i, repeat(md5('1234567890'), 1)::bytea, point(0,0) from generate_series(0,1) i;
+
+
+# create table t_bytea_1(file oid);
+# INSERT INTO t_bytea_1 (file)
+#    VALUES (lo_import('/home/gsmol/git/postgres/contrib/pg_probackup/tests/expected/sample.random', 24593));
+# insert into t_bytea select string_agg(data,'') from pg_largeobject where pageno > 0;
+#