Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

PGPRO-5018: Passing prev_backup_start_lsn (also known as horizonLsn) …#386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
gsmolk merged 1 commit intorelease_2_5fromrelease_2_5-pgpro-5018
May 26, 2021
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletionssrc/data.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -459,7 +459,7 @@ prepare_page(ConnectionArgs *conn_arg,
* Skip page if page lsn is less than START_LSN of parent backup.
* Nullified pages must be copied by DELTA backup, just to be safe.
*/
if (backup_mode == BACKUP_MODE_DIFF_DELTA &&
if ((backup_mode == BACKUP_MODE_DIFF_DELTA || backup_mode == BACKUP_MODE_DIFF_PTRACK) &&
file->exists_in_prev &&
page_st->lsn > 0 &&
page_st->lsn < prev_backup_start_lsn)
Expand DownExpand Up@@ -603,7 +603,7 @@ backup_data_file(ConnectionArgs* conn_arg, pgFile *file,

rc = fio_send_pages(to_fullpath, from_fullpath, file,
/* send prev backup START_LSN */
backup_mode == BACKUP_MODE_DIFF_DELTA &&
(backup_mode == BACKUP_MODE_DIFF_DELTA || backup_mode == BACKUP_MODE_DIFF_PTRACK) &&
file->exists_in_prev ? prev_backup_start_lsn : InvalidXLogRecPtr,
calg, clevel, checksum_version,
/* send pagemap if any */
Expand All@@ -616,7 +616,7 @@ backup_data_file(ConnectionArgs* conn_arg, pgFile *file,
/* TODO: stop handling errors internally */
rc = send_pages(conn_arg, to_fullpath, from_fullpath, file,
/* send prev backup START_LSN */
backup_mode == BACKUP_MODE_DIFF_DELTA &&
(backup_mode == BACKUP_MODE_DIFF_DELTA || backup_mode == BACKUP_MODE_DIFF_PTRACK) &&
file->exists_in_prev ? prev_backup_start_lsn : InvalidXLogRecPtr,
calg, clevel, checksum_version, use_pagemap,
&headers, backup_mode, ptrack_version_num, ptrack_schema);
Expand Down
6 changes: 3 additions & 3 deletionssrc/utils/file.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1992,13 +1992,13 @@ static void fio_send_pages_impl(int out, char* buf)
n_blocks_read++;

/*
* horizonLsn is not 0 only in case of delta backup.
* horizonLsn is not 0 only in case of deltaand ptrackbackup.
* As far as unsigned number are always greater or equal than zero,
* there is no sense to add more checks.
*/
if ((req->horizonLsn == InvalidXLogRecPtr) || /* full, page, ptrack */
if ((req->horizonLsn == InvalidXLogRecPtr) || /* full, page */
(page_st.lsn == InvalidXLogRecPtr) || /* zeroed page */
(req->horizonLsn > 0 && page_st.lsn > req->horizonLsn)) /* delta */
(req->horizonLsn > 0 && page_st.lsn > req->horizonLsn)) /* delta, ptrack */
{
int compressed_size = 0;
char write_buffer[BLCKSZ*2];
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp