Ensure cleanup in case of early errors in streaming base backups

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
index c6731d9f65b6bd36fbdc62231cb56a4b6588b0fe..a00bea6fc51984c5762ba0a5e26e73c546ec5601 100644 (file)
--- 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)
                {