Commit2f2d879

committed

fix for forkname detection in get_backup_filelist

1 parent5851068 commit2f2d879Copy full SHA for 2f2d879

File tree

-3

lines changed

-3

lines changed

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1138,14 +1138,18 @@ get_backup_filelist(pgBackup *backup, bool strict)`
`1138`	`1138`	`if (get_control_value_int64(buf,"hdr_size",&hdr_size, false))`
`1139`	`1139`	`file->hdr_size= (int)hdr_size;`
`1140`	`1140`
`1141`		`-if (file->external_dir_num==0)`
	`1141`	`+if (file->external_dir_num==0&&S_ISREG(file->mode))`
`1142`	`1142`	`{`
`1143`	`1143`	`boolis_datafile=file->is_datafile;`
`1144`	`1144`	`set_forkname(file);`
`1145`	`1145`	`if (is_datafile!=file->is_datafile)`
`1146`	`1146`	`{`
`1147`		`-elog(WARNING,"File '%s' was stored as datafile, but looks like it is not",`
`1148`		`-file->rel_path);`
	`1147`	`+if (is_datafile)`
	`1148`	`+elog(WARNING,"File '%s' was stored as datafile, but looks like it is not",`
	`1149`	`+file->rel_path);`
	`1150`	`+else`
	`1151`	`+elog(WARNING,"File '%s' was stored as non-datafile, but looks like it is",`
	`1152`	`+file->rel_path);`
`1149`	`1153`	`/* Lets fail in tests */`
`1150`	`1154`	`Assert(file->is_datafile==file->is_datafile);`
`1151`	`1155`	`file->is_datafile=is_datafile;`

Comments

(0)