diff --git a/doc/src/sgml/logical-replication.sgml b/doc/src/sgml/logical-replication.sgml index 555fbd749cc..1126ce4ccf7 100644 --- a/doc/src/sgml/logical-replication.sgml +++ b/doc/src/sgml/logical-replication.sgml @@ -363,21 +363,21 @@ CONTEXT: processing remote data for replication origin "pg_16395" during "INSER The LSN of the transaction that contains the change violating the constraint and the replication origin name can be found from the server log (LSN 0/14C0378 and replication origin pg_16395 in the above case). The - transaction that produces conflict can be skipped by using + transaction that produced the conflict can be skipped by using ALTER SUBSCRIPTION ... SKIP with the finish LSN (i.e., LSN 0/14C0378). The finish LSN could be an LSN at which the transaction is committed or prepared on the publisher. Alternatively, the transaction can also be skipped by calling the - pg_replication_origin_advance() function - transaction. Before using this function, the subscription needs to be disabled - temporarily either by ALTER SUBSCRIPTION ... DISABLE or, the + pg_replication_origin_advance() function. + Before using this function, the subscription needs to be disabled temporarily + either by ALTER SUBSCRIPTION ... DISABLE or, the subscription can be used with the disable_on_error option. Then, you can use pg_replication_origin_advance() function with the node_name (i.e., pg_16395) and the next LSN of the finish LSN (i.e., 0/14C0379). The current position of origins can be seen in the pg_replication_origin_status system view. - Please note that skipping the whole transaction include skipping changes that + Please note that skipping the whole transaction includes skipping changes that might not violate any constraint. This can easily make the subscriber inconsistent. diff --git a/doc/src/sgml/ref/alter_subscription.sgml b/doc/src/sgml/ref/alter_subscription.sgml index 7c5203b6d3b..353ea5def23 100644 --- a/doc/src/sgml/ref/alter_subscription.sgml +++ b/doc/src/sgml/ref/alter_subscription.sgml @@ -219,13 +219,13 @@ ALTER SUBSCRIPTION name RENAME TO < Skips applying all changes of the remote transaction. If incoming data violates any constraints, logical replication will stop until it is - resolved. By using ALTER SUBSCRIPTION ... SKIP command, + resolved. By using the ALTER SUBSCRIPTION ... SKIP command, the logical replication worker skips all data modification changes within the transaction. This option has no effect on the transactions that are already prepared by enabling two_phase on subscriber. - After logical replication worker successfully skips the transaction or - finishes a transaction, LSN (stored in + After the logical replication worker successfully skips the transaction or + finishes a transaction, the LSN (stored in pg_subscription.subskiplsn) is cleared. See for the details of logical replication conflicts. Using this command requires @@ -244,7 +244,7 @@ ALTER SUBSCRIPTION name RENAME TO < Specifies the finish LSN of the remote transaction whose changes are to be skipped by the logical replication worker. The finish LSN is the LSN at which the transaction is either committed or prepared. - Skipping individual subtransaction is not supported. Setting + Skipping individual subtransactions is not supported. Setting NONE resets the LSN.