mirror of
https://github.com/postgres/postgres.git
synced 2025-07-11 10:01:57 +03:00
Fix bug in cancellation of non-exclusive backup to avoid assertion failure.
Previously an assertion failure occurred when pg_stop_backup() for non-exclusive backup was aborted while it's waiting for WAL files to be archived. This assertion failure happened in do_pg_abort_backup() which was called when a non-exclusive backup was canceled. do_pg_abort_backup() assumes that there is at least one non-exclusive backup running when it's called. But pg_stop_backup() can be canceled even after it marks the end of non-exclusive backup (e.g., during waiting for WAL archiving). This broke the assumption that do_pg_abort_backup() relies on, and which caused an assertion failure. This commit changes do_pg_abort_backup() so that it does nothing when non-exclusive backup has been already marked as completed. That is, the asssumption is also changed, and do_pg_abort_backup() now can handle even the case where it's called when there is no running backup. Backpatch to 9.6 where SQL-callable non-exclusive backup was added. Author: Masahiko Sawada and Michael Paquier Reviewed-By: Robert Haas and Fujii Masao Discussion: https://www.postgresql.org/message-id/CAD21AoD2L1Fu2c==gnVASMyFAAaq3y-AQ2uEVj-zTCGFFjvmDg@mail.gmail.com
This commit is contained in:
@ -215,7 +215,7 @@ perform_base_backup(basebackup_options *opt)
|
||||
* Once do_pg_start_backup has been called, ensure that any failure causes
|
||||
* us to abort the backup so we don't "leak" a backup counter. For this
|
||||
* reason, *all* functionality between do_pg_start_backup() and
|
||||
* do_pg_stop_backup() should be inside the error cleanup block!
|
||||
* the end of do_pg_stop_backup() should be inside the error cleanup block!
|
||||
*/
|
||||
|
||||
PG_ENSURE_ERROR_CLEANUP(base_backup_cleanup, (Datum) 0);
|
||||
@ -324,10 +324,11 @@ perform_base_backup(basebackup_options *opt)
|
||||
else
|
||||
pq_putemptymessage('c'); /* CopyDone */
|
||||
}
|
||||
|
||||
endptr = do_pg_stop_backup(labelfile->data, !opt->nowait, &endtli);
|
||||
}
|
||||
PG_END_ENSURE_ERROR_CLEANUP(base_backup_cleanup, (Datum) 0);
|
||||
|
||||
endptr = do_pg_stop_backup(labelfile->data, !opt->nowait, &endtli);
|
||||
|
||||
if (opt->includewal)
|
||||
{
|
||||
|
Reference in New Issue
Block a user