NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit3e0d80f

committed

Fix resource management bug with replication=database.

Commit0d8c9c1 allowed BASE_BACKUP toacquire a ResourceOwner without a transaction so that the backupmanifest functionality could use a BufFile, but it overlooked the factthat when a walsender is used with replication=database, it might havea transaction in progress, because in that mode, SQL and replicationcommands can be mixed. Try to fix things up so that the two cleanupmechanisms don't conflict.Per buildfarm member serinus, which triggered the problem whenCREATE_REPLICATION_SLOT failed from inside a transaction. It passedon the subsequent run, so evidently the failure doesn't happen everytime.

1 parentdb1531c commit3e0d80fCopy full SHA for 3e0d80f

File tree

1 file changed

-1

lines changed

src/backend/replication
- walsender.c

1 file changed

-1

lines changed

`‎src/backend/replication/walsender.c`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,13 @@ WalSndErrorCleanup(void)`
`315`	`315`
`316`	`316`	`replication_active= false;`
`317`	`317`
`318`		`-WalSndResourceCleanup(false);`
	`318`	`+/*`
	`319`	`+ * If there is a transaction in progress, it will clean up our`
	`320`	`+ * ResourceOwner, but if a replication command set up a resource owner`
	`321`	`+ * without a transaction, we've got to clean that up now.`
	`322`	`+ */`
	`323`	`+if (!IsTransactionOrTransactionBlock())`
	`324`	`+WalSndResourceCleanup(false);`
`319`	`325`
`320`	`326`	`if (got_STOPPING\|\|got_SIGUSR2)`
`321`	`327`	`proc_exit(0);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit3e0d80f

File tree

1 file changed

1 file changed

`‎src/backend/replication/walsender.c`

0 commit comments