Ensure cleanup in case of early errors in streaming base backups

mhagander · mhagander · commit 0282dc2551e3 · 2014-05-28T13:04:08.000+02:00
Move the code that sends the initial status information as well as the
calculation of paths inside the ENSURE_ERROR_CLEANUP block. If this code
failed, we would "leak" a counter of number of concurrent backups, thereby
making the system always believe it was in backup mode. This could happen
if the sending failed (which it probably never did given that the small
amount of data to send would never cause a flush). It is very low risk, but
all operations after do_pg_start_backup should be protected.
diff --git a/src/backend/replication/basebackup.c b/src/backend/replication/basebackup.c
@@ -101,7 +101,6 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir)
 	datadirpathlen = strlen(DataDir);
 
 	startptr = do_pg_start_backup(opt->label, opt->fastcheckpoint, &labelfile);
-	SendXlogRecPtrResult(startptr);
 
 	PG_ENSURE_ERROR_CLEANUP(base_backup_cleanup, (Datum) 0);
 	{
@@ -110,6 +109,8 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir)
 		struct dirent *de;
 		tablespaceinfo *ti;
 
+		SendXlogRecPtrResult(startptr);
+
 		/* Collect information about all tablespaces */
 		while ((de = ReadDir(tblspcdir, "pg_tblspc")) != NULL)
 		{

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`	`struct dirent *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`	`{`