Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 343afa9

Browse files
author
Amit Kapila
committed
Fix executing invalidation messages generated by subtransactions during decoding.
This problem has been introduced by commit 272248a where we started assigning the subtransactions to the top-level transaction when we mark both the top-level transaction and its subtransactions as containing catalog changes. After we assign subtransactions to the top-level transaction, we were not allowed to execute any invalidations associated with it when we decide to skip the transaction. The reason to assign the subtransactions to the top-level transaction was to avoid the assertion failure in AssertTXNLsnOrder() as they have the same LSN when we sometimes start accumulating transaction changes for partial transactions after the restart. Now that with commit 64ff0fe, we skip this assertion check until we reach the LSN at which we start decoding the contents of the transaction, so, there is no reason for such an assignment anymore. The assignment change was introduced in 15 and prior versions but this bug doesn't exist in branches prior to 14 since we don't add invalidation messages to subtransactions. We decided to backpatch through 11 for consistency but not for 10 since its final release is near. Reported-by: Kuroda Hayato Author: Masahiko Sawada Reviewed-by: Amit Kapila Backpatch-through: 11 Discussion: https://postgr.es/m/TYAPR01MB58660803BCAA7849C8584AA4F57E9%40TYAPR01MB5866.jpnprd01.prod.outlook.com Discussion: https://postgr.es/m/a89b46b6-0239-2fd5-71a9-b19b1f7a7145%40enterprisedb.com
1 parent 536a3b8 commit 343afa9

File tree

3 files changed

+52
-3
lines changed

3 files changed

+52
-3
lines changed

contrib/test_decoding/expected/catalog_change_snapshot.out

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,3 +87,48 @@ COMMIT
8787
stop
8888
(1 row)
8989

90+
91+
starting permutation: s0_init s0_begin s0_savepoint s0_insert s1_checkpoint s1_get_changes s0_truncate s0_commit s0_begin s0_insert s1_checkpoint s1_get_changes s0_commit s1_get_changes
92+
step s0_init: SELECT 'init' FROM pg_create_logical_replication_slot('isolation_slot', 'test_decoding');
93+
?column?
94+
--------
95+
init
96+
(1 row)
97+
98+
step s0_begin: BEGIN;
99+
step s0_savepoint: SAVEPOINT sp1;
100+
step s0_insert: INSERT INTO tbl1 VALUES (1);
101+
step s1_checkpoint: CHECKPOINT;
102+
step s1_get_changes: SELECT data FROM pg_logical_slot_get_changes('isolation_slot', NULL, NULL, 'skip-empty-xacts', '1', 'include-xids', '0');
103+
data
104+
----
105+
(0 rows)
106+
107+
step s0_truncate: TRUNCATE tbl1;
108+
step s0_commit: COMMIT;
109+
step s0_begin: BEGIN;
110+
step s0_insert: INSERT INTO tbl1 VALUES (1);
111+
step s1_checkpoint: CHECKPOINT;
112+
step s1_get_changes: SELECT data FROM pg_logical_slot_get_changes('isolation_slot', NULL, NULL, 'skip-empty-xacts', '1', 'include-xids', '0');
113+
data
114+
-------------------------------------------------------------
115+
BEGIN
116+
table public.tbl1: INSERT: val1[integer]:1 val2[integer]:null
117+
table public.tbl1: TRUNCATE: (no-flags)
118+
COMMIT
119+
(4 rows)
120+
121+
step s0_commit: COMMIT;
122+
step s1_get_changes: SELECT data FROM pg_logical_slot_get_changes('isolation_slot', NULL, NULL, 'skip-empty-xacts', '1', 'include-xids', '0');
123+
data
124+
-------------------------------------------------------------
125+
BEGIN
126+
table public.tbl1: INSERT: val1[integer]:1 val2[integer]:null
127+
COMMIT
128+
(3 rows)
129+
130+
?column?
131+
--------
132+
stop
133+
(1 row)
134+

contrib/test_decoding/specs/catalog_change_snapshot.spec

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,10 @@ permutation "s0_init" "s0_begin" "s0_savepoint" "s0_truncate" "s1_checkpoint" "s
5353
# transaction to do timetravel since one of its subtransactions has been marked as
5454
# containing catalog changes.
5555
permutation "s0_init" "s0_begin" "s0_savepoint" "s0_insert" "s1_checkpoint" "s1_get_changes" "s0_insert2" "s0_commit" "s0_begin" "s0_insert" "s1_checkpoint" "s1_get_changes" "s0_commit" "s1_get_changes"
56+
57+
# The last decoding restarts from the first checkpoint and adds invalidation
58+
# messages generated by "s0_truncate" to the subtransaction. While
59+
# processing the commit record for the top-level transaction, we decide
60+
# to skip this xact but ensure that corresponding invalidation messages
61+
# get processed.
62+
permutation "s0_init" "s0_begin" "s0_savepoint" "s0_insert" "s1_checkpoint" "s1_get_changes" "s0_truncate" "s0_commit" "s0_begin" "s0_insert" "s1_checkpoint" "s1_get_changes" "s0_commit" "s1_get_changes"

src/backend/replication/logical/snapbuild.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2120,9 +2120,6 @@ SnapBuildXidSetCatalogChanges(SnapBuild *builder, TransactionId xid, int subxcnt
21202120
ReorderBufferXidSetCatalogChanges(builder->reorder, xid, lsn);
21212121

21222122
for (int i = 0; i < subxcnt; i++)
2123-
{
2124-
ReorderBufferAssignChild(builder->reorder, xid, subxacts[i], lsn);
21252123
ReorderBufferXidSetCatalogChanges(builder->reorder, subxacts[i], lsn);
2126-
}
21272124
}
21282125
}

0 commit comments

Comments
 (0)