Commit4d8489f

Amit Kapila

committed

Prohibit altering invalidated replication slots.

ALTER_REPLICATION_SLOT for invalid replication slots should not be allowedbecause there is no way to get back the invalidated (logical) slot towork.Author: Bharath RupireddyReviewed-by: Peter Smith, Shveta MalikDiscussion:https://www.postgresql.org/message-id/CALj2ACW4fSOMiKjQ3=2NVBMTZRTG8Ujg6jsK9z3EvOtvA4vzKQ@mail.gmail.com

1 parent7b1ddba commit4d8489fCopy full SHA for 4d8489f

File tree

+18

-1

lines changed

src
- backend/replication
  - slot.c
- test/recovery/t
  - 035_standby_logical_decoding.pl

+18

-1

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -820,6 +820,13 @@ ReplicationSlotAlter(const char name, const bool failover,`
`820`	`820`	`errmsg("cannot use %s with a physical replication slot",`
`821`	`821`	`"ALTER_REPLICATION_SLOT"));`
`822`	`822`
	`823`	`+if (MyReplicationSlot->data.invalidated!=RS_INVAL_NONE)`
	`824`	`+ereport(ERROR,`
	`825`	`+errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),`
	`826`	`+errmsg("cannot alter invalid replication slot \"%s\"",name),`
	`827`	`+errdetail("This replication slot has been invalidated due to \"%s\".",`
	`828`	`+SlotInvalidationCauses[MyReplicationSlot->data.invalidated]));`
	`829`	`+`
`823`	`830`	`if (RecoveryInProgress())`
`824`	`831`	`{`
`825`	`832`	`/*`

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -495,7 +495,8 @@ sub wait_until_vacuum_can_remove`
`495`	`495`	`# Scenario 1: hot_standby_feedback off and vacuum FULL`
`496`	`496`	`#`
`497`	`497`	`# In passing, ensure that replication slot stats are not removed when the`
`498`		`-# active slot is invalidated.`
	`498`	`+# active slot is invalidated, and check that an error occurs when`
	`499`	`+# attempting to alter the invalid slot.`
`499`	`500`	`##################################################`
`500`	`501`
`501`	`502`	`# One way to produce recovery conflict is to create/drop a relation and`
`@@ -526,6 +527,15 @@ sub wait_until_vacuum_can_remove`
`526`	`527`	`# Verify reason for conflict is 'rows_removed' in pg_replication_slots`
`527`	`528`	`check_slots_conflict_reason('vacuum_full_','rows_removed');`
`528`	`529`
	`530`	`+# Attempting to alter an invalidated slot should result in an error`
	`531`	`+($result,$stdout,$stderr) =$node_standby->psql(`
	`532`	`+'postgres',`
	`533`	`+qq[ALTER_REPLICATION_SLOT vacuum_full_inactiveslot (failover);],`
	`534`	`+replication=>'database');`
	`535`	`+ok($stderr =~/ERROR: cannot alter invalid replication slot "vacuum_full_inactiveslot"/ &&`
	`536`	`+$stderr =~/DETAIL: This replication slot has been invalidated due to "rows_removed"./,`
	`537`	`+"invalidated slot cannot be altered");`
	`538`	`+`
`529`	`539`	`# Ensure that replication slot stats are not removed after invalidation.`
`530`	`540`	`is($node_standby->safe_psql(`
`531`	`541`	`'testdb',`

Comments

(0)