Merge branch 'pgpro_2370'

Author: gsmolk

src/dir.c

@@ -630,6 +630,14 @@ dir_check_file(const char *root, pgFile *file)
 			}
 			else
 			{
+               /*
+                * snapfs files:
+                * RELFILENODE.BLOCKNO.snapmap.SNAPID
+                * RELFILENODE.BLOCKNO.snap.SNAPID
+                */
+               if (strstr(file->name, "snap") != NULL)
+                       return true;
+
 				len = strlen(file->name);
 				/* reloid.cfm */
 				if (len > 3 && strcmp(file->name + len - 3, "cfm") == 0)

tests/snapfs.py

@@ -11,7 +11,7 @@ class SnapFSTest(ProbackupTest, unittest.TestCase):
 
     # @unittest.skip("skip")
     # @unittest.expectedFailure
-    def test_backup_modes_archive(self):
+    def test_snapfs_simple(self):
         """standart backup modes with ARCHIVE WAL method"""
         fname = self.id().split('.')[3]
         node = self.make_simple_node(
@@ -32,7 +32,7 @@ def test_backup_modes_archive(self):
             'postgres',
             'select pg_make_snapshot()')
 
-        node.pgbench_init(scale=100)
+        node.pgbench_init(scale=10)
 
         pgbench = node.pgbench(options=['-T', '50', '-c', '2', '--no-vacuum'])
         pgbench.wait()
@@ -42,18 +42,18 @@ def test_backup_modes_archive(self):
 
         node.safe_psql(
             'postgres',
-            'select pg_remove_snashot(1)')
+            'select pg_remove_snapshot(1)')
 
         self.backup_node(
-            backup_dir, 'node', node)
+            backup_dir, 'node', node, backup_type='page')
 
         pgdata = self.pgdata_content(node.data_dir)
 
         node.cleanup()
 
         self.restore_node(
             backup_dir, 'node',
-            restored_node, options=["-j", "4"])
+            node, options=["-j", "4"])
 
         pgdata_restored = self.pgdata_content(node.data_dir)
         self.compare_pgdata(pgdata, pgdata_restored)