Commit32d283f

committed

Check for existance of an external directory

1 parentd489cc7 commit32d283fCopy full SHA for 32d283f

File tree

+16

-7

lines changed

+16

-7

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -888,7 +888,8 @@ do_backup_instance(void)`
`888`	`888`	`/* Scan backup PG_XLOG_DIR */`
`889`	`889`	`xlog_files_list=parray_new();`
`890`	`890`	`join_path_components(pg_xlog_path,database_path,PG_XLOG_DIR);`
`891`		`-dir_list_file(xlog_files_list,pg_xlog_path, false, true, false,0,FIO_BACKUP_HOST);`
	`891`	`+dir_list_file(xlog_files_list,pg_xlog_path, false, true, false,0,`
	`892`	`+FIO_BACKUP_HOST);`
`892`	`893`
`893`	`894`	`for (i=0;i<parray_num(xlog_files_list);i++)`
`894`	`895`	`{`

Lines changed: 12 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -163,13 +163,14 @@ dir_create_dir(const char *dir, mode_t mode)`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`pgFile*`
`166`		`-pgFileNew(constchar*path,boolomit_symlink,intexternal_dir_num,fio_locationlocation)`
	`166`	`+pgFileNew(constchar*path,boolomit_symlink,intexternal_dir_num,`
	`167`	`+fio_locationlocation)`
`167`	`168`	`{`
`168`	`169`	`structstatst;`
`169`	`170`	`pgFile*file;`
`170`	`171`
`171`		`-/* stat the file */`
`172`		`-if (fio_stat(path,&st,omit_symlink,location)<0)`
	`172`	`+/* stat the file */`
	`173`	`+if (fio_stat(path,&st,omit_symlink,location)<0)`
`173`	`174`	`{`
`174`	`175`	`/* file not found is not an error case */`
`175`	`176`	`if (errno==ENOENT)`
`@@ -475,11 +476,17 @@ dir_list_file(parray files, const char root, bool exclude, bool omit_symlink,`
`475`	`476`
`476`	`477`	`file=pgFileNew(root,omit_symlink,external_dir_num,location);`
`477`	`478`	`if (file==NULL)`
`478`		`-return;`
	`479`	`+{`
	`480`	`+/* For external directory this is not ok */`
	`481`	`+if (external_dir_num>0)`
	`482`	`+elog(ERROR,"Exteral directory is not found: %s",root);`
	`483`	`+else`
	`484`	`+return;`
	`485`	`+}`
`479`	`486`
`480`	`487`	`if (!S_ISDIR(file->mode))`
`481`	`488`	`{`
`482`		`-if (external_dir_num)`
	`489`	`+if (external_dir_num>0)`
`483`	`490`	`elog(ERROR," --external-dirs option \"%s\": directory or symbolic link expected",`
`484`	`491`	`file->path);`
`485`	`492`	`else`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -640,7 +640,8 @@ remove_deleted_files(pgBackup *backup)`
`640`	`640`
`641`	`641`	`/* Get list of files actually existing in target database */`
`642`	`642`	`files_restored=parray_new();`
`643`		`-dir_list_file(files_restored,instance_config.pgdata, true, true, false,0,FIO_BACKUP_HOST);`
	`643`	`+dir_list_file(files_restored,instance_config.pgdata, true, true, false,0,`
	`644`	`+FIO_BACKUP_HOST);`
`644`	`645`	`/* To delete from leaf, sort in reversed order */`
`645`	`646`	`parray_qsort(files_restored,pgFileComparePathDesc);`
`646`	`647`

Comments

(0)