From 959ac58c04130d467fb05e63a3ceb8e2ded404c7 Mon Sep 17 00:00:00 2001 From: Simon Riggs Date: Sat, 23 Jan 2010 16:37:12 +0000 Subject: In HS, Startup process sets SIGALRM when waiting for buffer pin. If woken by alarm we send SIGUSR1 to all backends requesting that they check to see if they are blocking Startup process. If so, they throw ERROR/FATAL as for other conflict resolutions. Deadlock stop gap removed. max_standby_delay = -1 option removed to prevent deadlock. --- src/backend/utils/misc/guc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/backend/utils/misc/guc.c') diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 274030195fb..6846d13a9c7 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -10,7 +10,7 @@ * Written by Peter Eisentraut . * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.533 2010/01/15 09:19:04 heikki Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.534 2010/01/23 16:37:12 sriggs Exp $ * *-------------------------------------------------------------------- */ @@ -1383,7 +1383,7 @@ static struct config_int ConfigureNamesInt[] = NULL }, &MaxStandbyDelay, - 30, -1, INT_MAX, NULL, NULL + 30, 0, INT_MAX, NULL, NULL }, { -- cgit v1.2.3