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
Appearance settings

[PGPRO-6037] fix catchup timeline history checking #462

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 2 commits into from
Dec 24, 2021
Merged

[PGPRO-6037] fix catchup timeline history checking #462

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f00f27e
[PGPRO-6037] fix catchup timeline history checking
kulaginm Dec 22, 2021
bfcf8a9
[PGPRO-6037] revert .travis.yml
kulaginm Dec 24, 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
6 changes: 6 additions & 0 deletions 6 .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 14 additions & 5 deletions 19 src/catchup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,8 @@ catchup_preflight_checks(PGNodeInfo *source_node_info, PGconn *source_conn,

/* fill dest_redo.lsn and dest_redo.tli */
get_redo(dest_pgdata, FIO_LOCAL_HOST, &dest_redo);
elog(VERBOSE, "source.tli = %X, dest_redo.lsn = %X/%X, dest_redo.tli = %X",
current.tli, (uint32) (dest_redo.lsn >> 32), (uint32) dest_redo.lsn, dest_redo.tli);

if (current.tli != 1)
{
Expand Down Expand Up @@ -285,11 +287,12 @@ catchup_check_tablespaces_existance_in_tbsmapping(PGconn *conn)
static parray*
catchup_get_tli_history(ConnectionOptions *conn_opt, TimeLineID tli)
{
PGresult *res;
PGconn *conn;
char *history;
char query[128];
parray *result = NULL;
PGresult *res;
PGconn *conn;
char *history;
char query[128];
parray *result = NULL;
TimeLineHistoryEntry *entry = NULL;

snprintf(query, sizeof(query), "TIMELINE_HISTORY %u", tli);

Expand Down Expand Up @@ -336,6 +339,12 @@ catchup_get_tli_history(ConnectionOptions *conn_opt, TimeLineID tli)
pg_free(history);
PQclear(res);

/* append last timeline entry (as read_timeline_history() do) */
entry = pgut_new(TimeLineHistoryEntry);
entry->tli = tli;
entry->end = InvalidXLogRecPtr;
parray_insert(result, 0, entry);

return result;
}

Expand Down
4 changes: 4 additions & 0 deletions 4 src/restore.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1821,11 +1821,15 @@ satisfy_timeline(const parray *timelines, TimeLineID tli, XLogRecPtr lsn)
{
int i;

elog(VERBOSE, "satisfy_timeline() checking: tli = %X, lsn = %X/%X",
tli, (uint32) (lsn >> 32), (uint32) lsn);
for (i = 0; i < parray_num(timelines); i++)
{
TimeLineHistoryEntry *timeline;

timeline = (TimeLineHistoryEntry *) parray_get(timelines, i);
elog(VERBOSE, "satisfy_timeline() check %i entry: timeline->tli = %X, timeline->end = %X/%X",
i, timeline->tli, (uint32) (timeline->end >> 32), (uint32) timeline->end);
if (tli == timeline->tli &&
(XLogRecPtrIsInvalid(timeline->end) ||
lsn <= timeline->end))
Expand Down
2 changes: 2 additions & 0 deletions 2 src/stream.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,8 @@ parse_tli_history_buffer(char *history, TimeLineID tli)
if (!result)
result = parray_new();
parray_append(result, entry);
elog(VERBOSE, "parse_tli_history_buffer() found entry: tli = %X, end = %X/%X",
tli, switchpoint_hi, switchpoint_lo);

/* we ignore the remainder of each line */
}
Expand Down
32 changes: 26 additions & 6 deletions 32 tests/catchup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ def test_tli_delta_catchup(self):
src_pg.safe_psql("postgres", "CREATE TABLE ultimate_question AS SELECT 42 AS answer")
src_query_result = src_pg.safe_psql("postgres", "SELECT * FROM ultimate_question")

# do catchup
# do catchup (src_tli = 2, dst_tli = 1)
self.catchup_node(
backup_mode = 'DELTA',
source_pgdata = src_pg.data_dir,
Expand All @@ -310,15 +310,25 @@ def test_tli_delta_catchup(self):
dst_options = {}
dst_options['port'] = str(dst_pg.port)
self.set_auto_conf(dst_pg, dst_options)
dst_pg.slow_start()
self.set_replica(master = src_pg, replica = dst_pg)
dst_pg.slow_start(replica = True)

# 2nd check: run verification query
dst_query_result = dst_pg.safe_psql("postgres", "SELECT * FROM ultimate_question")
self.assertEqual(src_query_result, dst_query_result, 'Different answer from copy')

dst_pg.stop()

# do catchup (src_tli = 2, dst_tli = 2)
self.catchup_node(
backup_mode = 'DELTA',
source_pgdata = src_pg.data_dir,
destination_node = dst_pg,
options = ['-d', 'postgres', '-p', str(src_pg.port), '--stream']
)

# Cleanup
src_pg.stop()
dst_pg.stop()
self.del_test_dir(module_name, self.fname)

def test_tli_ptrack_catchup(self):
Expand Down Expand Up @@ -365,7 +375,7 @@ def test_tli_ptrack_catchup(self):
src_pg.safe_psql("postgres", "CREATE TABLE ultimate_question AS SELECT 42 AS answer")
src_query_result = src_pg.safe_psql("postgres", "SELECT * FROM ultimate_question")

# do catchup
# do catchup (src_tli = 2, dst_tli = 1)
self.catchup_node(
backup_mode = 'PTRACK',
source_pgdata = src_pg.data_dir,
Expand All @@ -383,15 +393,25 @@ def test_tli_ptrack_catchup(self):
dst_options = {}
dst_options['port'] = str(dst_pg.port)
self.set_auto_conf(dst_pg, dst_options)
dst_pg.slow_start()
self.set_replica(master = src_pg, replica = dst_pg)
dst_pg.slow_start(replica = True)

# 2nd check: run verification query
dst_query_result = dst_pg.safe_psql("postgres", "SELECT * FROM ultimate_question")
self.assertEqual(src_query_result, dst_query_result, 'Different answer from copy')

dst_pg.stop()

# do catchup (src_tli = 2, dst_tli = 2)
self.catchup_node(
backup_mode = 'PTRACK',
source_pgdata = src_pg.data_dir,
destination_node = dst_pg,
options = ['-d', 'postgres', '-p', str(src_pg.port), '--stream']
)

# Cleanup
src_pg.stop()
dst_pg.stop()
self.del_test_dir(module_name, self.fname)

#########################################
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.