NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit0282dc2

committed

Ensure cleanup in case of early errors in streaming base backups

Move the code that sends the initial status information as well as thecalculation of paths inside the ENSURE_ERROR_CLEANUP block. If this codefailed, we would "leak" a counter of number of concurrent backups, therebymaking the system always believe it was in backup mode. This could happenif the sending failed (which it probably never did given that the smallamount of data to send would never cause a flush). It is very low risk, butall operations after do_pg_start_backup should be protected.

1 parent3ae8e8b commit0282dc2Copy full SHA for 0282dc2

File tree

1 file changed

-1

lines changed

src/backend/replication
- basebackup.c

1 file changed

-1

lines changed

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

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,6 @@ perform_base_backup(basebackup_options opt, DIR tblspcdir)`
`101`	`101`	`datadirpathlen=strlen(DataDir);`
`102`	`102`
`103`	`103`	`startptr=do_pg_start_backup(opt->label,opt->fastcheckpoint,&labelfile);`
`104`		`-SendXlogRecPtrResult(startptr);`
`105`	`104`
`106`	`105`	`PG_ENSURE_ERROR_CLEANUP(base_backup_cleanup, (Datum)0);`
`107`	`106`	`{`
`@@ -110,6 +109,8 @@ perform_base_backup(basebackup_options opt, DIR tblspcdir)`
`110`	`109`	`structdirent*de;`
`111`	`110`	`tablespaceinfo*ti;`
`112`	`111`
	`112`	`+SendXlogRecPtrResult(startptr);`
	`113`	`+`
`113`	`114`	`/* Collect information about all tablespaces */`
`114`	`115`	`while ((de=ReadDir(tblspcdir,"pg_tblspc"))!=NULL)`
`115`	`116`	`{`

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!

Commit0282dc2

File tree

1 file changed

1 file changed

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

0 commit comments