NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit3866ff6

committed

Enumerate available tablespaces after starting the backup

This closes a race condition where if a tablespace was createdafter the enumeration happened but before the do_pg_start_backup()was called, the backup would be incomplete. Now that it's donewhile we are in backup mode, WAL replay will recreate it duringrestore.Noted by Heikki.

1 parent3ab80cf commit3866ff6Copy full SHA for 3866ff6

File tree

1 file changed

+40

-37

lines changed

src/backend/replication
- basebackup.c

1 file changed

+40

-37

lines changed

`‎src/backend/replication/basebackup.c`

Lines changed: 40 additions & 37 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ static void send_int8_string(StringInfoData *buf, int64 intval);`
`40`	`40`	`staticvoidSendBackupHeader(List*tablespaces);`
`41`	`41`	`staticvoidSendBackupDirectory(charlocation,charspcoid);`
`42`	`42`	`staticvoidbase_backup_cleanup(intcode,Datumarg);`
`43`		`-staticvoidperform_base_backup(constcharbackup_label,Listtablespaces);`
	`43`	`+staticvoidperform_base_backup(constcharbackup_label,boolprogress,DIRtblspcdir);`
`44`	`44`
`45`	`45`	`typedefstruct`
`46`	`46`	`{`
`@@ -67,13 +67,50 @@ base_backup_cleanup(int code, Datum arg)`
`67`	`67`	`* clobbered by longjmp" from stupider versions of gcc.`
`68`	`68`	`*/`
`69`	`69`	`staticvoid`
`70`		`-perform_base_backup(constcharbackup_label,Listtablespaces)`
	`70`	`+perform_base_backup(constcharbackup_label,boolprogress,DIRtblspcdir)`
`71`	`71`	`{`
`72`	`72`	`do_pg_start_backup(backup_label, true);`
`73`	`73`
`74`	`74`	`PG_ENSURE_ERROR_CLEANUP(base_backup_cleanup, (Datum)0);`
`75`	`75`	`{`
	`76`	`+List*tablespaces=NIL;`
`76`	`77`	`ListCell*lc;`
	`78`	`+structdirent*de;`
	`79`	`+tablespaceinfo*ti;`
	`80`	`+`
	`81`	`+`
	`82`	`+/* Add a node for the base directory */`
	`83`	`+ti=palloc0(sizeof(tablespaceinfo));`
	`84`	`+ti->size=progress ?sendDir(".",1, true) :-1;`
	`85`	`+tablespaces=lappend(tablespaces,ti);`
	`86`	`+`
	`87`	`+/* Collect information about all tablespaces */`
	`88`	`+while ((de=ReadDir(tblspcdir,"pg_tblspc"))!=NULL)`
	`89`	`+{`
	`90`	`+charfullpath[MAXPGPATH];`
	`91`	`+charlinkpath[MAXPGPATH];`
	`92`	`+`
	`93`	`+/* Skip special stuff */`
	`94`	`+if (strcmp(de->d_name,".")==0\|\|strcmp(de->d_name,"..")==0)`
	`95`	`+continue;`
	`96`	`+`
	`97`	`+snprintf(fullpath,sizeof(fullpath),"pg_tblspc/%s",de->d_name);`
	`98`	`+`
	`99`	`+MemSet(linkpath,0,sizeof(linkpath));`
	`100`	`+if (readlink(fullpath,linkpath,sizeof(linkpath)-1)==-1)`
	`101`	`+{`
	`102`	`+ereport(WARNING,`
	`103`	`+(errmsg("unable to read symbolic link %s: %m",fullpath)));`
	`104`	`+continue;`
	`105`	`+}`
	`106`	`+`
	`107`	`+ti=palloc(sizeof(tablespaceinfo));`
	`108`	`+ti->oid=pstrdup(de->d_name);`
	`109`	`+ti->path=pstrdup(linkpath);`
	`110`	`+ti->size=progress ?sendDir(linkpath,strlen(linkpath), true) :-1;`
	`111`	`+tablespaces=lappend(tablespaces,ti);`
	`112`	`+}`
	`113`	`+`
`77`	`114`
`78`	`115`	`/* Send tablespace header */`
`79`	`116`	`SendBackupHeader(tablespaces);`
`@@ -101,9 +138,6 @@ void`
`101`	`138`	`SendBaseBackup(constchar*backup_label,boolprogress)`
`102`	`139`	`{`
`103`	`140`	`DIR*dir;`
`104`		`-structdirent*de;`
`105`		`-List*tablespaces=NIL;`
`106`		`-tablespaceinfo*ti;`
`107`	`141`	`MemoryContextbackup_context;`
`108`	`142`	`MemoryContextold_context;`
`109`	`143`
`@@ -134,41 +168,10 @@ SendBaseBackup(const char *backup_label, bool progress)`
`134`	`168`	`ereport(ERROR,`
`135`	`169`	`(errmsg("unable to open directory pg_tblspc: %m")));`
`136`	`170`
`137`		`-/* Add a node for the base directory */`
`138`		`-ti=palloc0(sizeof(tablespaceinfo));`
`139`		`-ti->size=progress ?sendDir(".",1, true) :-1;`
`140`		`-tablespaces=lappend(tablespaces,ti);`
`141`		`-`
`142`		`-/* Collect information about all tablespaces */`
`143`		`-while ((de=ReadDir(dir,"pg_tblspc"))!=NULL)`
`144`		`-{`
`145`		`-charfullpath[MAXPGPATH];`
`146`		`-charlinkpath[MAXPGPATH];`
`147`		`-`
`148`		`-/* Skip special stuff */`
`149`		`-if (strcmp(de->d_name,".")==0\|\|strcmp(de->d_name,"..")==0)`
`150`		`-continue;`
`151`		`-`
`152`		`-snprintf(fullpath,sizeof(fullpath),"pg_tblspc/%s",de->d_name);`
`153`		`-`
`154`		`-MemSet(linkpath,0,sizeof(linkpath));`
`155`		`-if (readlink(fullpath,linkpath,sizeof(linkpath)-1)==-1)`
`156`		`-{`
`157`		`-ereport(WARNING,`
`158`		`- (errmsg("unable to read symbolic link %s: %m",fullpath)));`
`159`		`-continue;`
`160`		`-}`
	`171`	`+perform_base_backup(backup_label,progress,dir);`
`161`	`172`
`162`		`-ti=palloc(sizeof(tablespaceinfo));`
`163`		`-ti->oid=pstrdup(de->d_name);`
`164`		`-ti->path=pstrdup(linkpath);`
`165`		`-ti->size=progress ?sendDir(linkpath,strlen(linkpath), true) :-1;`
`166`		`-tablespaces=lappend(tablespaces,ti);`
`167`		`-}`
`168`	`173`	`FreeDir(dir);`
`169`	`174`
`170`		`-perform_base_backup(backup_label,tablespaces);`
`171`		`-`
`172`	`175`	`MemoryContextSwitchTo(old_context);`
`173`	`176`	`MemoryContextDelete(backup_context);`
`174`	`177`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit3866ff6

File tree

1 file changed

1 file changed

`‎src/backend/replication/basebackup.c`

0 commit comments