tests: test_merge_tablespaces and test_merge_tablespaces_1 added

tests/helpers/ptrack_helpers.py

@@ -1123,7 +1123,7 @@ class ProbackupTest(object):
         for directory in restored_pgdata['dirs']:
             if directory not in original_pgdata['dirs']:
                 fail = True
-                error_message += '\nDirectory is not present'
+                error_message += '\nDirectory was not present'
                 error_message += ' in original PGDATA: {0}\n'.format(
                     os.path.join(restored_pgdata['pgdata'], directory))
 

tests/merge.py

@@ -3,6 +3,7 @@
 import unittest
 import os
 from .helpers.ptrack_helpers import ProbackupTest, ProbackupException
+import shutil
 
 module_name = "merge"
 
@@ -471,9 +472,162 @@ class MergeTest(ProbackupTest, unittest.TestCase):
 
     # @unittest.skip("skip")
     def test_merge_tablespaces(self):
+        """
+        Create tablespace with table
+        """
+        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',
+                'autovacuum': 'off'
+            }
+        )
+
+        self.init_pb(backup_dir)
+        self.add_instance(backup_dir, 'node', node)
+        self.set_archiving(backup_dir, 'node', node)
+        node.start()
+
+        self.create_tblspace_in_node(node, 'somedata')
+        node.safe_psql(
+            "postgres",
+            "create table t_heap tablespace somedata as select i as id,"
+            " md5(i::text) as text, md5(i::text)::tsvector as tsvector"
+            " from generate_series(0,100) i"
+        )
+        # FULL backup
+        self.backup_node(backup_dir, 'node', node)
+
+        # Create new tablespace
+        self.create_tblspace_in_node(node, 'somedata1')
+
+        node.safe_psql(
+            "postgres",
+            "create table t_heap1 tablespace somedata1 as select i as id,"
+            " md5(i::text) as text, md5(i::text)::tsvector as tsvector"
+            " from generate_series(0,100) i"
+        )
+
+        node.safe_psql(
+            "postgres",
+            "drop table t_heap"
+        )
+
+        # Drop old tablespace
+        node.safe_psql(
+            "postgres",
+            "drop tablespace somedata"
+        )
+
+        # PAGE backup
+        backup_id = self.backup_node(backup_dir, 'node', node, backup_type="page")
+
+        pgdata = self.pgdata_content(node.data_dir)
+
+        node.stop()
+        shutil.rmtree(
+            self.get_tblspace_path(node, 'somedata'),
+            ignore_errors=True)
+        shutil.rmtree(
+            self.get_tblspace_path(node, 'somedata1'),
+            ignore_errors=True)
+        node.cleanup()
+
+        self.merge_backup(backup_dir, 'node', backup_id)
+
+        self.restore_node(
+            backup_dir, 'node', node, options=["-j", "4"])
+
+        pgdata_restored = self.pgdata_content(node.data_dir)
+
+        # this compare should fall because we lost some directories
+        self.compare_pgdata(pgdata, pgdata_restored)
+
+    # @unittest.skip("skip")
+    def test_merge_tablespaces_1(self):
         """
         Some test here
         """
+        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',
+                'autovacuum': 'off'
+            }
+        )
+
+        self.init_pb(backup_dir)
+        self.add_instance(backup_dir, 'node', node)
+        self.set_archiving(backup_dir, 'node', node)
+        node.start()
+
+        self.create_tblspace_in_node(node, 'somedata')
+
+        # FULL backup
+        self.backup_node(backup_dir, 'node', node)
+        node.safe_psql(
+            "postgres",
+            "create table t_heap tablespace somedata as select i as id,"
+            " md5(i::text) as text, md5(i::text)::tsvector as tsvector"
+            " from generate_series(0,100) i"
+        )
+
+        # CREATE NEW TABLESPACE
+        self.create_tblspace_in_node(node, 'somedata1')
+
+        node.safe_psql(
+            "postgres",
+            "create table t_heap1 tablespace somedata1 as select i as id,"
+            " md5(i::text) as text, md5(i::text)::tsvector as tsvector"
+            " from generate_series(0,100) i"
+        )
+
+        # PAGE backup
+        self.backup_node(backup_dir, 'node', node, backup_type="page")
+
+        node.safe_psql(
+            "postgres",
+            "drop table t_heap"
+        )
+        node.safe_psql(
+            "postgres",
+            "drop tablespace somedata"
+        )
+
+        # DELTA backup
+        backup_id = self.backup_node(
+            backup_dir, 'node', node, backup_type="delta")
+
+        pgdata = self.pgdata_content(node.data_dir)
+
+        node.stop()
+        shutil.rmtree(
+            self.get_tblspace_path(node, 'somedata'),
+            ignore_errors=True)
+        shutil.rmtree(
+            self.get_tblspace_path(node, 'somedata1'),
+            ignore_errors=True)
+        node.cleanup()
+
+        self.merge_backup(backup_dir, 'node', backup_id)
+
+        self.restore_node(
+            backup_dir, 'node', node,
+            options=["-j", "4"])
+
+        pgdata_restored = self.pgdata_content(node.data_dir)
+        self.compare_pgdata(pgdata, pgdata_restored)
+
+        # Clean after yourself
+        self.del_test_dir(module_name, fname)
 
     def test_merge_page_truncate(self):
         """