db/pg_probackup
db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2025-02-13 14:58:35 +02:00
Code Issues Releases Activity

Wait for target LSN, not only for WAL segment

Browse Source
This commit is contained in:
Arthur Zakirov 2017-05-25 16:38:21 +03:00
parent aa9764d8e9
commit a98eb327e1
2 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
backup.c
View File

@ -837,9 +837,22 @@ wait_wal_lsn(XLogRecPtr lsn)
timeout = archive_timeout;
}
/* Wait until switched WAL is archived */
while (!fileExists(wal_segment_full_path))
/* Wait until target LSN is archived */
while (true)
{
bool file_exists = fileExists(wal_segment_full_path);
if (file_exists)
{
/*
* WAL segment was archived. Check LSN on it.
*/
if ((stream_wal && wal_contains_lsn(wal_dir, lsn, tli)) ||
(!stream_wal && wal_contains_lsn(arclog_path, lsn, tli)))
/* Target LSN was found */
return;
}
sleep(1);
if (interrupted)
elog(ERROR, "interrupted during waiting for WAL archiving");
@ -851,18 +864,17 @@ wait_wal_lsn(XLogRecPtr lsn)
(uint32) (lsn >> 32), (uint32) lsn, wal_segment_full_path);
if (timeout > 0 && try_count > timeout)
elog(ERROR,
"switched WAL segment %s could not be archived in %d seconds",
wal_segment, timeout);
{
if (file_exists)
elog(ERROR, "WAL segment %s was archived, "
"but target LSN %X/%X could not be archived in %d seconds",
wal_segment, (uint32) (lsn >> 32), (uint32) lsn, timeout);
else
elog(ERROR,
"switched WAL segment %s could not be archived in %d seconds",
wal_segment, timeout);
}
}
/*
* WAL segment was archived. Check LSN on it.
*/
if ((stream_wal && !wal_contains_lsn(wal_dir, lsn, tli)) ||
(!stream_wal && !wal_contains_lsn(arclog_path, lsn, tli)))
elog(ERROR, "WAL segment %s doesn't contain target LSN %X/%X",
wal_segment, (uint32) (lsn >> 32), (uint32) lsn);
}
/*
@ -984,8 +996,11 @@ pg_stop_backup(pgBackup *backup)
PQclear(res);
if (stream_wal)
{
/* Wait for the completion of stream */
elog(LOG, "Wait end of WAL streaming");
pthread_join(stream_thread, NULL);
}
wait_wal_lsn(stop_backup_lsn);
/* Fill in fields if that is the correct end of backup. */

10
parsexlog.c
View File

@ -508,15 +508,7 @@ wal_contains_lsn(const char *archivedir, XLogRecPtr target_lsn,
elog(ERROR, "out of memory");
res = XLogReadRecord(xlogreader, target_lsn, &errormsg) != NULL;
if (!res)
{
if (errormsg)
elog(ERROR, "could not read WAL record at %X/%X: %s",
(uint32) (target_lsn >> 32), (uint32) (target_lsn),
errormsg);
/* Didn't find 'target_lsn' and there is no error, return false */
}
/* Didn't find 'target_lsn' and there is no error, return false */
XLogReaderFree(xlogreader);
if (xlogreadfd != -1)