fix template0 backup. Always copy all files of this database

alubennikova · alubennikova · commit a8f2b432ce8b · 2017-10-01T18:28:39.000+03:00
diff --git a/src/backup.c b/src/backup.c
@@ -2317,6 +2317,16 @@ make_pagemap_from_ptrack(parray *files)
 		 */
 		if (file->is_database)
 		{
+			char *filename = strrchr(file->path, '/');
+
+			Assert(filename != NULL);
+			filename++;
+
+			elog(ERROR, "filename %s", filename);
+			/* always backup all files from template0 */
+			if (strcmp(filename, "template0") == 0)
+					continue;
+
 			/*
 			 * The function pg_ptrack_get_and_clear_db returns true
 			 * if there was a ptrack_init file
diff --git a/src/dir.c b/src/dir.c
@@ -384,6 +384,7 @@ dir_list_file_internal(parray *files, const char *root, bool exclude,
 	if (add_root)
 	{
 		/* Skip files */
+		/* TODO Consider moving this check to parse_backup_filelist_filenames */
 		if (!S_ISDIR(file->mode) && exclude)
 		{
 			char	    *file_name;

Original file line number	Diff line number	Diff line change
`@@ -384,6 +384,7 @@ dir_list_file_internal(parray files, const char root, bool exclude,`
`384`	`384`	`if (add_root)`
`385`	`385`	`{`
`386`	`386`	`/* Skip files */`
	`387`	`+ /* TODO Consider moving this check to parse_backup_filelist_filenames */`
`387`	`388`	`if (!S_ISDIR(file->mode) && exclude)`
`388`	`389`	`{`
`389`	`390`	`char *file_name;`