From 9623b0af6ed38caab3909fb72d702453a6554791 Mon Sep 17 00:00:00 2001 From: "Mikhail A. Kulagin" Date: Wed, 22 Dec 2021 05:48:42 +0300 Subject: [PATCH 1/2] [Issue #459][PGPRO-6034] Fix catchup (delta and ptrack) data corruption --- .travis.yml | 6 ++++++ src/catchup.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 876289e82..22b20f70a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,11 +28,17 @@ notifications: env: - PG_VERSION=15 PG_BRANCH=master PTRACK_PATCH_PG_BRANCH=master - PG_VERSION=14 PG_BRANCH=REL_14_STABLE PTRACK_PATCH_PG_BRANCH=REL_14_STABLE + - PG_VERSION=14 PG_BRANCH=REL_14_STABLE PTRACK_PATCH_PG_BRANCH=REL_14_STABLE MODE=catchup - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE + - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=catchup - PG_VERSION=12 PG_BRANCH=REL_12_STABLE PTRACK_PATCH_PG_BRANCH=REL_12_STABLE + - PG_VERSION=12 PG_BRANCH=REL_12_STABLE PTRACK_PATCH_PG_BRANCH=REL_12_STABLE MODE=catchup - PG_VERSION=11 PG_BRANCH=REL_11_STABLE PTRACK_PATCH_PG_BRANCH=REL_11_STABLE + - PG_VERSION=11 PG_BRANCH=REL_11_STABLE PTRACK_PATCH_PG_BRANCH=REL_11_STABLE MODE=catchup - PG_VERSION=10 PG_BRANCH=REL_10_STABLE + - PG_VERSION=10 PG_BRANCH=REL_10_STABLE MODE=catchup - PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE + - PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE MODE=catchup - PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE # - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=archive # - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=backup diff --git a/src/catchup.c b/src/catchup.c index f9145a395..78a1e5265 100644 --- a/src/catchup.c +++ b/src/catchup.c @@ -921,7 +921,7 @@ do_catchup(const char *source_pgdata, const char *dest_pgdata, int num_threads, char fullpath[MAXPGPATH]; join_path_components(fullpath, dest_pgdata, file->rel_path); - fio_delete(file->mode, fullpath, FIO_DB_HOST); + fio_delete(file->mode, fullpath, FIO_LOCAL_HOST); elog(VERBOSE, "Deleted file \"%s\"", fullpath); /* shrink dest pgdata list */ From 240accc6e86de0d599781d120008dda99a5fd8df Mon Sep 17 00:00:00 2001 From: "Mikhail A. Kulagin" Date: Fri, 24 Dec 2021 13:16:46 +0300 Subject: [PATCH 2/2] [Issue #459][PGPRO-6034] revert .travis.yml --- .travis.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 22b20f70a..876289e82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,17 +28,11 @@ notifications: env: - PG_VERSION=15 PG_BRANCH=master PTRACK_PATCH_PG_BRANCH=master - PG_VERSION=14 PG_BRANCH=REL_14_STABLE PTRACK_PATCH_PG_BRANCH=REL_14_STABLE - - PG_VERSION=14 PG_BRANCH=REL_14_STABLE PTRACK_PATCH_PG_BRANCH=REL_14_STABLE MODE=catchup - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE - - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=catchup - PG_VERSION=12 PG_BRANCH=REL_12_STABLE PTRACK_PATCH_PG_BRANCH=REL_12_STABLE - - PG_VERSION=12 PG_BRANCH=REL_12_STABLE PTRACK_PATCH_PG_BRANCH=REL_12_STABLE MODE=catchup - PG_VERSION=11 PG_BRANCH=REL_11_STABLE PTRACK_PATCH_PG_BRANCH=REL_11_STABLE - - PG_VERSION=11 PG_BRANCH=REL_11_STABLE PTRACK_PATCH_PG_BRANCH=REL_11_STABLE MODE=catchup - PG_VERSION=10 PG_BRANCH=REL_10_STABLE - - PG_VERSION=10 PG_BRANCH=REL_10_STABLE MODE=catchup - PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE - - PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE MODE=catchup - PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE # - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=archive # - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=backup