Commit9eacd42

committed

Make sure walsender state is only read while holding the spinlock

Noted by Robert Haas.

1 parent712dd95 commit9eacd42Copy full SHA for 9eacd42

File tree

-1

lines changed

-1

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1050,6 +1050,7 @@ pg_stat_get_wal_senders(PG_FUNCTION_ARGS)`
`1050`	`1050`	`volatileWalSnd*walsnd=&WalSndCtl->walsnds[i];`
`1051`	`1051`	`charsent_location[MAXFNAMELEN];`
`1052`	`1052`	`XLogRecPtrsentPtr;`
	`1053`	`+WalSndStatestate;`
`1053`	`1054`	`Datumvalues[PG_STAT_GET_WAL_SENDERS_COLS];`
`1054`	`1055`	`boolnulls[PG_STAT_GET_WAL_SENDERS_COLS];`
`1055`	`1056`
`@@ -1058,14 +1059,15 @@ pg_stat_get_wal_senders(PG_FUNCTION_ARGS)`
`1058`	`1059`
`1059`	`1060`	`SpinLockAcquire(&walsnd->mutex);`
`1060`	`1061`	`sentPtr=walsnd->sentPtr;`
	`1062`	`+state=walsnd->state;`
`1061`	`1063`	`SpinLockRelease(&walsnd->mutex);`
`1062`	`1064`
`1063`	`1065`	`snprintf(sent_location,sizeof(sent_location),"%X/%X",`
`1064`	`1066`	`sentPtr.xlogid,sentPtr.xrecoff);`
`1065`	`1067`
`1066`	`1068`	`memset(nulls,0,sizeof(nulls));`
`1067`	`1069`	`values[0]=Int32GetDatum(walsnd->pid);`
`1068`		`-values[1]=CStringGetTextDatum(WalSndGetStateString(walsnd->state));`
	`1070`	`+values[1]=CStringGetTextDatum(WalSndGetStateString(state));`
`1069`	`1071`	`values[2]=CStringGetTextDatum(sent_location);`
`1070`	`1072`
`1071`	`1073`	`tuplestore_putvalues(tupstore,tupdesc,values,nulls);`

Comments

(0)