aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlvaro Herrera <alvherre@alvh.no-ip.org>2014-11-14 15:14:02 -0300
committerAlvaro Herrera <alvherre@alvh.no-ip.org>2014-11-14 15:14:02 -0300
commit137e4da6df75a671d53bcc1e66097533c93c8732 (patch)
treeb78f056c726ef3c31df0289017f4cc525004bb74
parent16695d601e73792c3e49f324b48ff25af96c83d9 (diff)
downloadpostgresql-137e4da6df75a671d53bcc1e66097533c93c8732.tar.gz
postgresql-137e4da6df75a671d53bcc1e66097533c93c8732.zip
Allow interrupting GetMultiXactIdMembers
This function has a loop which can lead to uninterruptible process "stalls" (actually infinite loops) when some bugs are triggered. Avoid that unpleasant situation by adding a check for interrupts in a place that shouldn't degrade performance in the normal case. Backpatch to 9.3. Older branches have an identical loop here, but the aforementioned bugs are only a problem starting in 9.3 so there doesn't seem to be any point in backpatching any further.
-rw-r--r--src/backend/access/transam/multixact.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c
index 9f259bb54eb..ddb61f1ffb2 100644
--- a/src/backend/access/transam/multixact.c
+++ b/src/backend/access/transam/multixact.c
@@ -1258,6 +1258,7 @@ retry:
{
/* Corner case 2: next multixact is still being filled in */
LWLockRelease(MultiXactOffsetControlLock);
+ CHECK_FOR_INTERRUPTS();
pg_usleep(1000L);
goto retry;
}