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 1fca9411225836bc4b53fbf9c1aac90fc493fde6..c52e453d2fcca29d3ace418e3214bd0fb7f5d400 100644 (file)
--- a/src/backend/replication/basebackup.c
+++ b/src/backend/replication/basebackup.c
@@ -109,7 +109,6 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir)
 
    startptr = do_pg_start_backup(opt->label, opt->fastcheckpoint, &starttli,
                                  &labelfile);
-   SendXlogRecPtrResult(startptr, starttli);
 
    PG_ENSURE_ERROR_CLEANUP(base_backup_cleanup, (Datum) 0);
    {
@@ -118,6 +117,8 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir)
        struct dirent *de;
        tablespaceinfo *ti;
 
+       SendXlogRecPtrResult(startptr, starttli);
+
        /* Collect information about all tablespaces */
        while ((de = ReadDir(tblspcdir, "pg_tblspc")) != NULL)
        {