Commit4f163d8

committed

Make pg_control file optional for restore.

1 parent375d915 commit4f163d8Copy full SHA for 4f163d8

File tree

+33

-15

lines changed

+33

-15

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ do_backup_database(parray *backup_list, pgBackupOption bkupopt)`
`107`	`107`	`* obtained at output of pg_start_backup or pg_stop_backup does`
`108`	`108`	`* not contain this information.`
`109`	`109`	`*/`
`110`		`-current.tli=get_current_timeline();`
	`110`	`+current.tli=get_current_timeline(false);`
`111`	`111`
`112`	`112`	`/*`
`113`	`113`	`* In differential backup mode, check if there is an already-validated`
`@@ -567,7 +567,7 @@ wait_for_archive(pgBackup backup, const char sql)`
`567`	`567`	`* Enforce TLI obtention if backup is not present as this code`
`568`	`568`	`* path can be taken as a callback at exit.`
`569`	`569`	`*/`
`570`		`-tli=get_current_timeline();`
	`570`	`+tli=get_current_timeline(false);`
`571`	`571`
`572`	`572`	`/* Fill in fields if backup exists */`
`573`	`573`	`if (backup!=NULL)`

Lines changed: 22 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`*`
`34`	`34`	`*/`
`35`	`35`	`char*`
`36`		`-slurpFile(constchardatadir,constcharpath,size_t*filesize)`
	`36`	`+slurpFile(constchardatadir,constcharpath,size_t*filesize,boolsafe)`
`37`	`37`	`{`
`38`	`38`	`intfd;`
`39`	`39`	`char*buffer;`
`@@ -43,20 +43,35 @@ slurpFile(const char datadir, const char path, size_t *filesize)`
`43`	`43`	`snprintf(fullpath,sizeof(fullpath),"%s/%s",datadir,path);`
`44`	`44`
`45`	`45`	`if ((fd=open(fullpath,O_RDONLY \|PG_BINARY,0))==-1)`
`46`		`-elog(ERROR,"could not open file \"%s\" for reading: %s",`
`47`		`-fullpath,strerror(errno));`
	`46`	`+{`
	`47`	`+if (safe)`
	`48`	`+returnNULL;`
	`49`	`+else`
	`50`	`+elog(ERROR,"could not open file \"%s\" for reading: %s",`
	`51`	`+fullpath,strerror(errno));`
	`52`	`+}`
`48`	`53`
`49`	`54`	`if (fstat(fd,&statbuf)<0)`
`50`		`-elog(ERROR,"could not open file \"%s\" for reading: %s",`
`51`		`-fullpath,strerror(errno));`
	`55`	`+{`
	`56`	`+if (safe)`
	`57`	`+returnNULL;`
	`58`	`+else`
	`59`	`+elog(ERROR,"could not open file \"%s\" for reading: %s",`
	`60`	`+fullpath,strerror(errno));`
	`61`	`+}`
`52`	`62`
`53`	`63`	`len=statbuf.st_size;`
`54`	`64`
`55`	`65`	`buffer=pg_malloc(len+1);`
`56`	`66`
`57`	`67`	`if (read(fd,buffer,len)!=len)`
`58`		`-elog(ERROR,"could not read file \"%s\": %s\n",`
`59`		`-fullpath,strerror(errno));`
	`68`	`+{`
	`69`	`+if (safe)`
	`70`	`+returnNULL;`
	`71`	`+else`
	`72`	`+elog(ERROR,"could not read file \"%s\": %s\n",`
	`73`	`+fullpath,strerror(errno));`
	`74`	`+}`
`60`	`75`
`61`	`76`	`close(fd);`
`62`	`77`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,8 @@ extern void pgBackupDelete(int keep_generations, int keep_days);`
`231`	`231`	`/* in fetch.c */`
`232`	`232`	`externcharslurpFile(constchardatadir,`
`233`	`233`	`constchar*path,`
`234`		`-size_t*filesize);`
	`234`	`+size_t*filesize,`
	`235`	`+boolsafe);`
`235`	`236`
`236`	`237`	`/* in validate.c */`
`237`	`238`	`externintdo_validate(pgBackupRange*range);`
`@@ -291,7 +292,7 @@ extern void extractPageMap(const char *datadir, XLogRecPtr startpoint,`
`291`	`292`	`TimeLineIDtli,XLogRecPtrendpoint);`
`292`	`293`
`293`	`294`	`/* in util.c */`
`294`		`-externTimeLineIDget_current_timeline(void);`
	`295`	`+externTimeLineIDget_current_timeline(boolsafe);`
`295`	`296`	`externvoidsanityChecks(void);`
`296`	`297`	`externvoidtime2iso(char*buf,size_tlen,time_ttime);`
`297`	`298`	`externconstchar*status2str(BackupStatusstatus);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ do_restore(const char *target_time,`
`98`	`98`	`if (!backups)`
`99`	`99`	`elog(ERROR,"cannot process any more.");`
`100`	`100`
`101`		`-cur_tli=get_current_timeline();`
	`101`	`+cur_tli=get_current_timeline(true);`
`102`	`102`	`backup_tli=get_fullbackup_timeline(backups,rt);`
`103`	`103`
`104`	`104`	`/* determine target timeline */`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ sanityChecks(void)`
`60`	`60`	`size_tsize;`
`61`	`61`
`62`	`62`	`/* First fetch file... */`
`63`		`-buffer=slurpFile(pgdata,"global/pg_control",&size);`
	`63`	`+buffer=slurpFile(pgdata,"global/pg_control",&size, false);`
`64`	`64`	`digestControlFile(&ControlFile,buffer,size);`
`65`	`65`	`pg_free(buffer);`
`66`	`66`
`@@ -80,14 +80,16 @@ sanityChecks(void)`
`80`	`80`	`* used by a node.`
`81`	`81`	`*/`
`82`	`82`	`TimeLineID`
`83`		`-get_current_timeline(void)`
	`83`	`+get_current_timeline(boolsafe)`
`84`	`84`	`{`
`85`	`85`	`ControlFileDataControlFile;`
`86`	`86`	`char*buffer;`
`87`	`87`	`size_tsize;`
`88`	`88`
`89`	`89`	`/* First fetch file... */`
`90`		`-buffer=slurpFile(pgdata,"global/pg_control",&size);`
	`90`	`+buffer=slurpFile(pgdata,"global/pg_control",&size,safe);`
	`91`	`+if (buffer==NULL)`
	`92`	`+return0;`
`91`	`93`	`digestControlFile(&ControlFile,buffer,size);`
`92`	`94`	`pg_free(buffer);`
`93`	`95`

Comments

(0)