db/pg_probackup
db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2024-11-28 09:33:54 +02:00
Code Issues Releases Activity

Fix WAL segment file generation

Browse Source 
Name file of WAL segment was generated using the API of xlog_internal.h
called XlogFileName, based on XLogSegNo and not XLogRecPtr as the
previous code assumed. This leaded to backup incorrect, actually too
many WAL files in the archive code path because the analysis was based
on a name completely fucked up. This commit fixes at the same time an
issue in search_next_wal where the function could loop for a too long
amount of time, eating much CPU when looking for the next WAL file.

Regression tests are passing cleanly with this patch.
This commit is contained in:
Michael Paquier 2013-12-25 08:17:01 +09:00
parent 78d92ff8fb
commit ced83f7703
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backup.c
View File

@ -433,7 +433,7 @@ do_backup_arclog(parray *backup_list)
char prev_file_txt[MAXPGPATH];
pgBackup *prev_backup;
int64 arclog_write_bytes = 0;
char last_wal[MAXPGPATH];
char last_wal[MAXFNAMELEN];
Assert(current.backup_mode == BACKUP_MODE_ARCHIVE ||
current.backup_mode == BACKUP_MODE_INCREMENTAL ||
@ -485,7 +485,7 @@ do_backup_arclog(parray *backup_list)
dir_list_file(files, arclog_path, NULL, true, false);
/* remove WALs archived after pg_stop_backup()/pg_switch_xlog() */
xlog_fname(last_wal, lengthof(last_wal), current.tli, &current.stop_lsn);
xlog_fname(last_wal, current.tli, current.stop_lsn);
for (i = 0; i < parray_num(files); i++)
{
pgFile *file = (pgFile *) parray_get(files, i);
@ -1023,7 +1023,7 @@ wait_for_archive(pgBackup *backup, const char *sql)
}
/* As well as WAL file name */
XLogFileName(file_name, tli, lsn);
xlog_fname(file_name, tli, lsn);
snprintf(ready_path, lengthof(ready_path),
"%s/pg_xlog/archive_status/%s.ready", pgdata,

2
pg_rman.h
View File

@ -307,7 +307,7 @@ extern int pgFileCompareMtimeDesc(const void *f1, const void *f2);
/* in xlog.c */
extern bool xlog_is_complete_wal(const pgFile *file);
extern void xlog_fname(char *fname, size_t len, TimeLineID tli, XLogRecPtr *lsn);
extern void xlog_fname(char *fname, TimeLineID tli, XLogRecPtr lsn);
/* in data.c */
extern bool backup_data_file(const char *from_root, const char *to_root,

6
restore.c
View File

@ -992,7 +992,7 @@ search_next_wal(const char *path, XLogRecPtr *need_lsn, parray *timelines)
{
pgTimeLine *timeline = (pgTimeLine *) parray_get(timelines, i);
XLogFileName(xlogfname, timeline->tli, *need_lsn);
xlog_fname(xlogfname, timeline->tli, *need_lsn);
join_path_components(xlogpath, path, xlogfname);
if (stat(xlogpath, &st) == 0)
@ -1021,8 +1021,8 @@ search_next_wal(const char *path, XLogRecPtr *need_lsn, parray *timelines)
parray_remove(timelines, i + 1);
/* XXX: should we add a linebreak when we find a timeline? */
/* Move to next xlog record */
(*need_lsn)++;
/* Move to next xlog segment */
*need_lsn += XLogSegSize;
}
}

8
xlog.c
View File

@ -73,9 +73,9 @@ xlog_is_complete_wal(const pgFile *file)
* based on XLogFileName() in xlog_internal.h
*/
void
xlog_fname(char *fname, size_t len, TimeLineID tli, XLogRecPtr *lsn)
xlog_fname(char *fname, TimeLineID tli, XLogRecPtr lsn)
{
snprintf(fname, len, "%08X%08X%08X", tli,
(uint32) (*lsn / XLogSegSize),
(uint32) (*lsn % XLogSegSize));
snprintf(fname, MAXFNAMELEN, "%08X%08X%08X", tli,
(uint32) (lsn >> 32),
(uint32) (lsn / XLogSegSize));
}