Write ERROR status of the backup before executing pg_stop_backup()

za-arthur · za-arthur · commit 62eee9cfdccb · 2017-05-19T12:08:16.000+03:00
diff --git a/backup.c b/backup.c
@@ -1006,14 +1006,6 @@ backup_cleanup(bool fatal, void *userdata)
 {
 	char path[MAXPGPATH];
 
-	/* If backup_label exists in $PGDATA, notify stop of backup to PostgreSQL */
-	join_path_components(path, pgdata, PG_BACKUP_LABEL_FILE);
-	if (fileExists(path))
-	{
-		elog(LOG, "%s exists, stop backup", PG_BACKUP_LABEL_FILE);
-		pg_stop_backup(NULL);	/* don't care stop_lsn on error case */
-	}
-
 	/*
 	 * Update status of backup in BACKUP_CONTROL_FILE to ERROR.
 	 * end_time != 0 means backup finished
@@ -1025,6 +1017,17 @@ backup_cleanup(bool fatal, void *userdata)
 		current.status = BACKUP_STATUS_ERROR;
 		pgBackupWriteBackupControlFile(&current);
 	}
+
+	/*
+	 * If backup_label exists in $PGDATA, notify stop of backup to PostgreSQL
+	 * TODO Do we need this?
+	 */
+	join_path_components(path, pgdata, PG_BACKUP_LABEL_FILE);
+	if (fileExists(path))
+	{
+		elog(LOG, "%s exists, stop backup", PG_BACKUP_LABEL_FILE);
+		pg_stop_backup(NULL);	/* don't care stop_lsn on error case */
+	}
 }
 
 /*
