Commit96a5f13

committed

Save and compare system-identifier.

1 parent90897a5 commit96a5f13Copy full SHA for 96a5f13

File tree

+31

-0

lines changed

+31

-0

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ do_init(void)`
`34`	`34`	`char*log_directory=NULL;`
`35`	`35`	`char*archive_command=NULL;`
`36`	`36`	`FILE*fp;`
	`37`	`+uint64_system_identifier;`
`37`	`38`
`38`	`39`	`structdirent**dp;`
`39`	`40`	`intresults;`
`@@ -58,6 +59,7 @@ do_init(void)`
`58`	`59`	`parse_postgresql_conf(path,&log_directory,&archive_command);`
`59`	`60`	`}`
`60`	`61`
	`62`	`+_system_identifier=get_system_identifier(false);`
`61`	`63`	`/* create pg_probackup.conf */`
`62`	`64`	`join_path_components(path,backup_path,PG_RMAN_INI_FILE);`
`63`	`65`	`fp=fopen(path,"wt");`
`@@ -67,6 +69,7 @@ do_init(void)`
`67`	`69`	`join_path_components(arclog_path_dir,backup_path,"wal");`
`68`	`70`	`dir_create_dir(arclog_path_dir,DIR_PERMISSION);`
`69`	`71`
	`72`	`+fprintf(fp,"system-identifier = %li\n",_system_identifier);`
`70`	`73`	`fprintf(fp,"\n");`
`71`	`74`	`fclose(fp);`
`72`	`75`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ boolfrom_replica = false;`
`40`	`40`	`staticboolbackup_logs= false;`
`41`	`41`	`boolprogress= false;`
`42`	`42`	`booldelete_wal= false;`
	`43`	`+uint64system_identifier=0;`
`43`	`44`
`44`	`45`	`/* restore configuration */`
`45`	`46`	`staticchar*target_time;`
`@@ -74,6 +75,8 @@ static pgut_option options[] =`
`74`	`75`	`{'u',6,"timeline",&target_tli,SOURCE_CMDLINE },`
`75`	`76`	`/* delete options */`
`76`	`77`	`{'b',12,"wal",&delete_wal },`
	`78`	`+/* other */`
	`79`	`+{'U',13,"system-identifier",&system_identifier,SOURCE_FILE },`
`77`	`80`	`{0 }`
`78`	`81`	`};`
`79`	`82`
`@@ -188,10 +191,16 @@ main(int argc, char *argv[])`
`188`	`191`	`{`
`189`	`192`	`pgBackupOptionbkupopt;`
`190`	`193`	`intres;`
	`194`	`+uint64_system_identifier;`
`191`	`195`	`bkupopt.smooth_checkpoint=smooth_checkpoint;`
`192`	`196`	`bkupopt.keep_data_generations=keep_data_generations;`
`193`	`197`	`bkupopt.keep_data_days=keep_data_days;`
`194`	`198`
	`199`	`+_system_identifier=get_system_identifier(true);`
	`200`	`+if (_system_identifier!=system_identifier)`
	`201`	`+elog(ERROR,"Backup directory was initialized for system id = %ld, but target system id = %ld",`
	`202`	`+system_identifier,_system_identifier);`
	`203`	`+`
`195`	`204`	`/* Do the backup */`
`196`	`205`	`res=do_backup(bkupopt);`
`197`	`206`	`if (res!=0)`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -205,6 +205,7 @@ extern bool stream_wal;`
`205`	`205`	`externboolfrom_replica;`
`206`	`206`	`externboolprogress;`
`207`	`207`	`externbooldelete_wal;`
	`208`	`+externuint64system_identifier;`
`208`	`209`
`209`	`210`	`/* in backup.c */`
`210`	`211`	`externintdo_backup(pgBackupOptionbkupopt);`
`@@ -310,6 +311,7 @@ extern XLogRecPtr get_last_ptrack_lsn(void);`
`310`	`311`	`externuint32get_data_checksum_version(boolsafe);`
`311`	`312`	`externchar*base36enc(long unsignedintvalue);`
`312`	`313`	`externlong unsignedintbase36dec(constchar*text);`
	`314`	`+externuint64get_system_identifier(boolsafe);`
`313`	`315`
`314`	`316`	`/* in status.c */`
`315`	`317`	`externboolis_pg_running(void);`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,23 @@ get_current_timeline(bool safe)`
`122`	`122`	`returnControlFile.checkPointCopy.ThisTimeLineID;`
`123`	`123`	`}`
`124`	`124`
	`125`	`+uint64`
	`126`	`+get_system_identifier(boolsafe)`
	`127`	`+{`
	`128`	`+ControlFileDataControlFile;`
	`129`	`+char*buffer;`
	`130`	`+size_tsize;`
	`131`	`+`
	`132`	`+/* First fetch file... */`
	`133`	`+buffer=slurpFile(pgdata,"global/pg_control",&size,safe);`
	`134`	`+if (buffer==NULL)`
	`135`	`+return0;`
	`136`	`+digestControlFile(&ControlFile,buffer,size);`
	`137`	`+pg_free(buffer);`
	`138`	`+`
	`139`	`+returnControlFile.system_identifier;`
	`140`	`+}`
	`141`	`+`
`125`	`142`	`uint32`
`126`	`143`	`get_data_checksum_version(boolsafe)`
`127`	`144`	`{`

Comments

(0)