Commitadee1ef

committed

Fix remote restore

1 parentd064a64 commitadee1efCopy full SHA for adee1ef

File tree

+15

-10

lines changed

+15

-10

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2317,8 +2317,9 @@ backup_files(void *arg)`
`2317`	`2317`	`}`
`2318`	`2318`	`}`
`2319`	`2319`	`elseif (strcmp(file->name,"pg_control")==0)`
`2320`		`-copy_pgcontrol_file(arguments->from_root,arguments->to_root,`
`2321`		`-file,FIO_BACKUP_HOST);`
	`2320`	`+copy_pgcontrol_file(arguments->from_root,FIO_DB_HOST,`
	`2321`	`+arguments->to_root,FIO_BACKUP_HOST,`
	`2322`	`+file);`
`2322`	`2323`	`else`
`2323`	`2324`	`{`
`2324`	`2325`	`boolskip= false;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -559,7 +559,7 @@ merge_files(void *arg)`
`559`	`559`	`}`
`560`	`560`	`}`
`561`	`561`	`elseif (strcmp(file->name,"pg_control")==0)`
`562`		`-copy_pgcontrol_file(argument->from_root,argument->to_root,file,FIO_LOCAL_HOST);`
	`562`	`+copy_pgcontrol_file(argument->from_root,FIO_LOCAL_HOST,argument->to_root,FIO_LOCAL_HOST,file);`
`563`	`563`	`else`
`564`	`564`	`copy_file(argument->from_root,FIO_LOCAL_HOST,argument->to_root,FIO_LOCAL_HOST,file);`
`565`	`565`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -612,8 +612,8 @@ extern pg_crc32c get_pgcontrol_checksum(const char *pgdata_path);`
`612`	`612`	`externuint32get_xlog_seg_size(char*pgdata_path);`
`613`	`613`	`externvoidset_min_recovery_point(pgFilefile,constcharbackup_path,`
`614`	`614`	`XLogRecPtrstop_backup_lsn);`
`615`		`-externvoidcopy_pgcontrol_file(constcharfrom_root,constcharto_root,`
`616`		`-pgFile*file,fio_locationlocation);`
	`615`	`+externvoidcopy_pgcontrol_file(constcharfrom_root,fio_locationlocation,constcharto_root,fio_locationto_location,`
	`616`	`+pgFile*file);`
`617`	`617`
`618`	`618`	`externvoidsanityChecks(void);`
`619`	`619`	`externvoidtime2iso(char*buf,size_tlen,time_ttime);`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -674,9 +674,13 @@ restore_files(void *arg)`
`674`	`674`	`parse_program_version(arguments->backup->program_version));`
`675`	`675`	`}`
`676`	`676`	`elseif (strcmp(file->name,"pg_control")==0)`
`677`		`-copy_pgcontrol_file(from_root,instance_config.pgdata,file,FIO_DB_HOST);`
	`677`	`+copy_pgcontrol_file(from_root,FIO_BACKUP_HOST,`
	`678`	`+instance_config.pgdata,FIO_DB_HOST,`
	`679`	`+file);`
`678`	`680`	`else`
`679`		`-copy_file(from_root,FIO_BACKUP_HOST,instance_config.pgdata,FIO_DB_HOST,file);`
	`681`	`+copy_file(from_root,FIO_BACKUP_HOST,`
	`682`	`+instance_config.pgdata,FIO_DB_HOST,`
	`683`	`+file);`
`680`	`684`
`681`	`685`	`/* print size of restored file */`
`682`	`686`	`if (file->write_size!=BYTES_INVALID)`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -360,14 +360,14 @@ set_min_recovery_point(pgFile file, const char backup_path,`
`360`	`360`	`* Copy pg_control file to backup. We do not apply compression to this file.`
`361`	`361`	`*/`
`362`	`362`	`void`
`363`		`-copy_pgcontrol_file(constcharfrom_root,constcharto_root,pgFile*file,fio_locationlocation)`
	`363`	`+copy_pgcontrol_file(constcharfrom_root,fio_locationfrom_location,constcharto_root,fio_locationto_location,pgFile*file)`
`364`	`364`	`{`
`365`	`365`	`ControlFileDataControlFile;`
`366`	`366`	`char*buffer;`
`367`	`367`	`size_tsize;`
`368`	`368`	`charto_path[MAXPGPATH];`
`369`	`369`
`370`		`-buffer=slurpFile(from_root,XLOG_CONTROL_FILE,&size, false,FIO_DB_HOST);`
	`370`	`+buffer=slurpFile(from_root,XLOG_CONTROL_FILE,&size, false,from_location);`
`371`	`371`
`372`	`372`	`digestControlFile(&ControlFile,buffer,size);`
`373`	`373`
`@@ -376,7 +376,7 @@ copy_pgcontrol_file(const char from_root, const char to_root, pgFile *file, fi`
`376`	`376`	`file->write_size=size;`
`377`	`377`
`378`	`378`	`join_path_components(to_path,to_root,file->path+strlen(from_root)+1);`
`379`		`-writeControlFile(&ControlFile,to_path,location);`
	`379`	`+writeControlFile(&ControlFile,to_path,to_location);`
`380`	`380`
`381`	`381`	`pg_free(buffer);`
`382`	`382`	`}`

Comments

(0)