Skip to content

Fix for upcoming postgresql-15 compatibility #409

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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 73 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
5cd672d
[Issue #224] New flag '--color' for coloring the show plain backup in…
gsmolk Jul 7, 2020
63b7909
Merge branch 'master' into release_2_5
gsmolk Jul 7, 2020
26578ed
bump version to 2.5.0
gsmolk Jul 7, 2020
3836509
[Issue #224] enable the stdout and stderr coloring by default
gsmolk Jul 7, 2020
f1b30e5
Merge branch 'master' into release_2_5
gsmolk Nov 11, 2020
98bb4fc
Merge branch 'master' into release_2_5
gsmolk Nov 12, 2020
75c8a8f
Merge branch 'master' into release_2_5
gsmolk Nov 12, 2020
5bf17cc
Merge branch 'master' into release_2_5
Dec 9, 2020
3f09845
remove backup_subcmd global variable and useless command_name variable
kulaginm Dec 29, 2020
00be188
Merge commit 'refs/pull/291/head' of https://github.com/postgrespro/p…
gsmolk Dec 29, 2020
a5ec1be
Merge branch 'master' into refs/pull/291/head
gsmolk Dec 29, 2020
dceed02
Merge branch 'master' into release_2_5
gsmolk Dec 29, 2020
8aea21d
add version and help help pages
kulaginm Dec 30, 2020
7383ddd
add some comments
gsmolk Jan 6, 2021
e2bbd4f
Merge pull request #291 from kulaginm/cmdline-refactor
gsmolk Jan 11, 2021
6e20f55
Merge branch 'refs/pull/291/head' into release_2_5
gsmolk Jan 11, 2021
0fdcc73
Merge branch 'master' into release_2_5
alubennikova Jan 22, 2021
1d50157
calm down compiler warning
alubennikova Jan 22, 2021
40aeb8b
fix merge conflict
alubennikova Jan 22, 2021
fc1bef8
Merge branch 'master' into release_2_5
gsmolk Jan 27, 2021
2ae2908
Code cleanup. Remove unused functions
alubennikova Feb 2, 2021
0fd2fde
Code cleanup. Remove unused pgBackupGetPath() function
alubennikova Feb 2, 2021
f26c959
remove unneeded funtion dir_read_file_list()
alubennikova Feb 2, 2021
94d4236
Merge branch 'master' into release_2_5
alubennikova Feb 2, 2021
da2c49d
code cleanup
alubennikova Feb 2, 2021
c1e81ed
Code cleanup. Start removing global variables in pg_probackup.c
alubennikova Feb 3, 2021
24a7a08
Code cleanup. Pass backup_catalog_path explicitly to functions that n…
alubennikova Feb 3, 2021
7ef802d
Add a comment declaring code refactoring plan
alubennikova Feb 3, 2021
2284c2b
Refactoring. Introduce catalogState structure. Update code in init.c
alubennikova Feb 3, 2021
48b8f60
Refactoring. Introduce instanceState structure. Update code in init.c
alubennikova Feb 3, 2021
3d62e2a
Refactoting. Move new state definitions to a separate header
alubennikova Feb 3, 2021
cc58553
Refactoring. Cleanup comments
alubennikova Feb 3, 2021
dbf5233
Refactoring. Use instanceState instead of global variable instance_name
alubennikova Feb 3, 2021
341d7b8
Refactoring. Get rid of global variable instance_name
alubennikova Feb 3, 2021
b956feb
Refactoring. Get rid of global variable backup_path
alubennikova Feb 3, 2021
9940967
Refactoring. Get rid of global variable backup_instance_path
alubennikova Feb 3, 2021
d9b3fb2
Refactoring. Get rid of global variable archlog_path
alubennikova Feb 3, 2021
6c52147
Refactoring. Get rid of global variable backup_instance_path (2)
alubennikova Feb 3, 2021
f897931
Refactoring. Remove redundand fields from InstanceConfig
alubennikova Feb 3, 2021
736b9c2
Refactoring. Fixes of previous changes
alubennikova Feb 4, 2021
23b5ea5
Merge branch 'master' into release_2_5
alubennikova Feb 4, 2021
e268421
Merge branch 'master' into release_2_5
gsmolk Feb 14, 2021
cf08885
Merge branch 'master' into release_2_5
gsmolk May 15, 2021
0e4b3a9
[Issue #385] pg_stop_backup refactoring, part 1
gsmolk May 18, 2021
d8050e5
[Issue #385] improve test coverage
gsmolk May 18, 2021
ac2e7cc
PGPRO-5018: Passing prev_backup_start_lsn (also known as horizonLsn) …
kulaginm May 24, 2021
ab85396
Merge branch 'master' into release_2_5
gsmolk May 26, 2021
991917e
Merge pull request #386 from postgrespro/release_2_5-pgpro-5018
gsmolk May 26, 2021
3c66873
[PR #386] fix
gsmolk May 26, 2021
151d499
[PR #386] test coverage
gsmolk May 26, 2021
3013a78
Release 2 5 pg stop backup decomposition2 (#387)
kulaginm May 27, 2021
6bdd241
Merge branch 'master' into release_2_5
gsmolk Jun 3, 2021
02ca67d
Merge branch 'master' into release_2_5
gsmolk Jun 12, 2021
13a1821
Merge branch 'master' into release_2_5
gsmolk Jun 14, 2021
da2cbcb
[Issue #394] fio_close is now synchronous
gsmolk Jun 14, 2021
97b23c4
Merge branch 'master' into release_2_5
gsmolk Jun 16, 2021
cce59bc
Remove ptrack-1.* support (#398)
kulaginm Jun 17, 2021
c8c7436
Merge branch 'master' into release_2_5
gsmolk Jun 17, 2021
4c27a93
tests: minor fix in ptrack.py
gsmolk Jun 17, 2021
5f54e62
travis: start sshd in container
gsmolk Jun 17, 2021
88bea54
travis: move to python3
gsmolk Jun 17, 2021
365c959
travis: some more fixes
gsmolk Jun 17, 2021
45b7816
Merge branch 'master' into release_2_5
gsmolk Jun 17, 2021
dbbfee4
tests: disable ptrack testing for PG < 11
gsmolk Jun 17, 2021
11e1240
Merge branch 'master' into release_2_5
gsmolk Jun 17, 2021
7ca590c
tests: drop ptrack1 suppport
gsmolk Jun 18, 2021
148afb2
Merge branch 'master' into release_2_5
gsmolk Jun 18, 2021
d55838e
fix test restore.RestoreTest.test_missing_database_map for PGPROEE11 …
kulaginm Jun 18, 2021
ad4fc96
fix segfault in get_index_list
gsmolk Jun 18, 2021
b13d3b8
Merge branch 'master' into release_2_5
gsmolk Jun 20, 2021
7de7284
Catchup command implementation (#392)
kulaginm Jun 21, 2021
07127b8
[Issue #400] some leftovers
gsmolk Jun 21, 2021
aebf319
Add compatibility with postgres master (upcoming PG-15).
kulaginm Jul 15, 2021
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
Prev Previous commit
Next Next commit
PGPRO-5018: Passing prev_backup_start_lsn (also known as horizonLsn) …
…into fio_send_pages() and send_pages() in case of ptrack backup for additional verification of block changes on the server side (without test yet).
  • Loading branch information
kulaginm committed May 24, 2021
commit ac2e7ccf1c5f72fbe452bb6110c98cf03077d575
6 changes: 3 additions & 3 deletions src/data.c
Original file line number Diff line number Diff 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 Down Expand 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 deletions src/utils/file.c
Original file line number Diff line number Diff 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 delta and ptrack backup.
* 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