NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commita1fb849

committed

Properly initialize write, flush and replay locations in walsender slots

These would leak random xlog positions if a walsender used for backup woulda walsender slot previously used by a replication walsender.In passing also fix a couple of cases where the xlog pointer is directlycompared to zero instead of using XLogRecPtrIsInvalid, noted byMichael Paquier.

1 parent5f1de60 commita1fb849Copy full SHA for a1fb849

File tree

1 file changed

-3

lines changed

src/backend/replication
- walsender.c

1 file changed

-3

lines changed

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

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1195,6 +1195,9 @@ InitWalSenderSlot(void)`
`1195`	`1195`	`*/`
`1196`	`1196`	`walsnd->pid=MyProcPid;`
`1197`	`1197`	`walsnd->sentPtr=InvalidXLogRecPtr;`
	`1198`	`+walsnd->write=InvalidXLogRecPtr;`
	`1199`	`+walsnd->flush=InvalidXLogRecPtr;`
	`1200`	`+walsnd->apply=InvalidXLogRecPtr;`
`1198`	`1201`	`walsnd->state=WALSNDSTATE_STARTUP;`
`1199`	`1202`	`SpinLockRelease(&walsnd->mutex);`
`1200`	`1203`	`/* don't need the lock anymore */`
`@@ -1994,19 +1997,19 @@ pg_stat_get_wal_senders(PG_FUNCTION_ARGS)`
`1994`	`1997`	`(uint32) (sentPtr >>32), (uint32)sentPtr);`
`1995`	`1998`	`values[2]=CStringGetTextDatum(location);`
`1996`	`1999`
`1997`		`-if (write==0)`
	`2000`	`+if (XLogRecPtrIsInvalid(write))`
`1998`	`2001`	`nulls[3]= true;`
`1999`	`2002`	`snprintf(location,sizeof(location),"%X/%X",`
`2000`	`2003`	`(uint32) (write >>32), (uint32)write);`
`2001`	`2004`	`values[3]=CStringGetTextDatum(location);`
`2002`	`2005`
`2003`		`-if (flush==0)`
	`2006`	`+if (XLogRecPtrIsInvalid(flush))`
`2004`	`2007`	`nulls[4]= true;`
`2005`	`2008`	`snprintf(location,sizeof(location),"%X/%X",`
`2006`	`2009`	`(uint32) (flush >>32), (uint32)flush);`
`2007`	`2010`	`values[4]=CStringGetTextDatum(location);`
`2008`	`2011`
`2009`		`-if (apply==0)`
	`2012`	`+if (XLogRecPtrIsInvalid(apply))`
`2010`	`2013`	`nulls[5]= true;`
`2011`	`2014`	`snprintf(location,sizeof(location),"%X/%X",`
`2012`	`2015`	`(uint32) (apply >>32), (uint32)apply);`

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!

Commita1fb849

File tree

1 file changed

1 file changed

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

0 commit comments