Skip to content

catchup functionality expansion #419

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.

Sign up for GitHub

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

Merged
merged 28 commits into from
Aug 13, 2021
Merged

catchup functionality expansion #419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
eaa6497
try to apply ptrack patch in travis builds
kulaginm Aug 2, 2021
cb9f3e3
catchup revision, 1st item: removing the requirement of a clean shutd…
kulaginm Aug 2, 2021
e18e43d
2nd try to apply ptrack patch in travis builds
kulaginm Aug 2, 2021
6f696cf
3rd try to apply ptrack patch in travis builds
kulaginm Aug 2, 2021
de96c5b
4th try to apply ptrack patch in travis builds
kulaginm Aug 3, 2021
f9d8ae9
5th try to apply ptrack patch in travis builds
kulaginm Aug 3, 2021
957258c
test ptrack patch in various tests on travis
kulaginm Aug 3, 2021
f5d2db3
[DOC] [PGPRO-5218] Incorporated feedback from Anastasia Lubennikova, …
indrups Aug 3, 2021
43c1190
update travis test suite
kulaginm Aug 3, 2021
5045ccd
debug travis allow_failures
kulaginm Aug 3, 2021
9ee84ec
Merge branch 'release_2_5' into pgpro-5218
kulaginm Aug 3, 2021
61b8c77
catchup: add reporting (transferred size and incremental ratio)
kulaginm Aug 6, 2021
14974a3
trigger travis build
kulaginm Aug 6, 2021
4aaaf4f
--create-permanent-slot option
kulaginm Aug 7, 2021
0cb7740
fix ptrack test for EE-9.6
kulaginm Aug 7, 2021
57a7a55
fix tests for PG<10
kulaginm Aug 7, 2021
8810bd2
fix tests PG<=9.6 (remove usage of unsupported --temp-slot option)
kulaginm Aug 7, 2021
b342e86
one more fix for test_basic_temp_slot_for_stream_backup at PG<10
kulaginm Aug 7, 2021
6270d90
minor changes based on previous review
kulaginm Aug 7, 2021
8bb785a
[Issue 380][PGPRO-5218][PGPRO-5019] Catchup: --exclude-path implement…
kulaginm Aug 7, 2021
92ddbc1
[DOC] [PGPRO-5218] Added descriptions of --exclude-path and --create-…
indrups Aug 11, 2021
e2e7bd6
rename --create-permanent-slot into --perm-slot
kulaginm Aug 12, 2021
97ad660
[DOC] [PGPRO-5218] [skip travis] Incorporated feedback from Mikhail K…
indrups Aug 12, 2021
2bbcd30
Merge branch 'release_2_5' into pgpro-5218
kulaginm Aug 13, 2021
3a8a018
[PGPRO-5218] Review and some refactoring
gsmolk Aug 13, 2021
c2637c0
Merge branch 'pgpro-5218' of github.com:postgrespro/pg_probackup into…
gsmolk Aug 13, 2021
ccd6a0d
[DOC] [PGPRO-5218][skip travis] Mentioned that --exclude-path only pe…
indrups Aug 13, 2021
f5f6f76
last minute fixes
kulaginm Aug 13, 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
33 changes: 18 additions & 15 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,26 @@ notifications:

# Default MODE is basic, i.e. all tests with PG_PROBACKUP_TEST_BASIC=ON
env:
- PG_VERSION=14 PG_BRANCH=REL_14_STABLE
- PG_VERSION=13 PG_BRANCH=REL_13_STABLE
- PG_VERSION=12 PG_BRANCH=REL_12_STABLE
- PG_VERSION=11 PG_BRANCH=REL_11_STABLE
- PG_VERSION=15 PG_BRANCH=master PTRACK_PATCH_PG_VERSION=13
- PG_VERSION=14 PG_BRANCH=REL_14_STABLE PTRACK_PATCH_PG_VERSION=13
- PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_VERSION=13
- PG_VERSION=12 PG_BRANCH=REL_12_STABLE PTRACK_PATCH_PG_VERSION=12
- PG_VERSION=11 PG_BRANCH=REL_11_STABLE PTRACK_PATCH_PG_VERSION=11
- PG_VERSION=10 PG_BRANCH=REL_10_STABLE
- PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE
- PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=archive
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=backup
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=compression
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=delta
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=locking
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=merge
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=page
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=replica
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=retention
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=restore
- PG_VERSION=15 PG_BRANCH=master
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_VERSION=off MODE=archive
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_VERSION=13 MODE=backup
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_VERSION=13 MODE=catchup
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_VERSION=off MODE=compression
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_VERSION=off MODE=delta
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_VERSION=off MODE=locking
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_VERSION=13 MODE=merge
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_VERSION=off MODE=page
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_VERSION=13 MODE=ptrack
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_VERSION=13 MODE=replica
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_VERSION=off MODE=retention
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_VERSION=13 MODE=restore

jobs:
allow_failures:
Expand All @@ -54,3 +56,4 @@ jobs:
#branches:
# only:
# - master

179 changes: 144 additions & 35 deletions doc/pgprobackup.xml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions src/backup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ do_backup_pg(InstanceState *instanceState, PGconn *backup_conn,
fio_mkdir(stream_xlog_path, DIR_PERMISSION, FIO_BACKUP_HOST);

start_WAL_streaming(backup_conn, stream_xlog_path, &instance_config.conn_opt,
current.start_lsn, current.tli);
current.start_lsn, current.tli, true);

/* Make sure that WAL streaming is working
* PAGE backup in stream mode is waited twice, first for
Expand Down Expand Up @@ -2051,8 +2051,6 @@ backup_files(void *arg)
instance_config.compress_alg,
instance_config.compress_level,
arguments->nodeInfo->checksum_version,
arguments->nodeInfo->ptrack_version_num,
arguments->nodeInfo->ptrack_schema,
arguments->hdr_map, false);
}
else
Expand Down Expand Up @@ -2350,7 +2348,7 @@ calculate_datasize_of_filelist(parray *filelist)
{
pgFile *file = (pgFile *) parray_get(filelist, i);

if (file->external_dir_num != 0)
if (file->external_dir_num != 0 || file->excluded)
continue;

if (S_ISDIR(file->mode))
Expand Down
Loading