Skip to content

Commit 8b8db01

Browse files
committed
Minor improvement in SI overflow logic: try to delete
expired messages before concluding that we really have buffer overflow.
1 parent 9e713dd commit 8b8db01

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

src/backend/storage/ipc/sinvaladt.c

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.25 1999/09/06 19:37:38 tgl Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.26 1999/09/09 14:56:06 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -228,9 +228,19 @@ SIInsertDataEntry(SISeg *segP, SharedInvalidData *data)
228228
/* Is the buffer full? */
229229
if (numMsgs >= MAXNUMMESSAGES)
230230
{
231-
/* Yes, so force reset */
232-
SISetProcStateInvalid(segP);
233-
return false;
231+
/*
232+
* Don't panic just yet: slowest backend might have consumed some
233+
* messages but not yet have done SIDelExpiredDataEntries() to
234+
* advance minMsgNum. So, make sure minMsgNum is up-to-date.
235+
*/
236+
SIDelExpiredDataEntries(segP);
237+
numMsgs = segP->maxMsgNum - segP->minMsgNum;
238+
if (numMsgs >= MAXNUMMESSAGES)
239+
{
240+
/* Yup, it's definitely full, no choice but to reset */
241+
SISetProcStateInvalid(segP);
242+
return false;
243+
}
234244
}
235245

236246
/*

0 commit comments

Comments
 (0)