database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-29 16:21:20 +03:00
Code

The attached patch improves pg_ctl's win32 service code to eliminate

Browse Source 
some possible causes of the stale postmaster.pid problem that some users
have reported.

- The service did not properly report that it accepts
SERVICE_CONTROL_SHUTDOWN events, thus it's possible the SCM simply
killed the postmaster on shutdown.

- 'WaitHints' are now given to the SCM to prevent it timing out if
pg_ctl doesn't respond to a control event quickly enough.

- During shutdown, the service checkpoint counter is incremented every
five seconds for up to a minute to prevent the SCM timing out and
assuming the service is not responding.

Dave Page
This commit is contained in:
Bruce Momjian 2004-08-28 23:26:37 +00:00
parent f7587aeba8
commit fe90fb4d37
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/bin/pg_ctl/pg_ctl.c
View File

@ -4,7 +4,7 @@
* *
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
* *
* $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.27 2004/08/28 22:04:01 momjian Exp $ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.28 2004/08/28 23:26:37 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -938,12 +938,18 @@ static void WINAPI pgwin32_ServiceHandler(DWORD request)
{ {
case SERVICE_CONTROL_STOP: case SERVICE_CONTROL_STOP:
case SERVICE_CONTROL_SHUTDOWN: case SERVICE_CONTROL_SHUTDOWN:
/*
* We only need a short wait hint here as it just needs to wait for
* the next checkpoint. They occur every 5 seconds during shutdown
*/
status.dwWaitHint = 10000;
pgwin32_SetServiceStatus(SERVICE_STOP_PENDING); pgwin32_SetServiceStatus(SERVICE_STOP_PENDING);
SetEvent(shutdownEvent); SetEvent(shutdownEvent);
return; return;
case SERVICE_CONTROL_PAUSE: case SERVICE_CONTROL_PAUSE:
/* Win32 config reloading */ /* Win32 config reloading */
status.dwWaitHint = 5000;
kill(postmasterPID,SIGHUP); kill(postmasterPID,SIGHUP);
return; return;
@ -964,9 +970,9 @@ static void WINAPI pgwin32_ServiceMain(DWORD argc, LPTSTR *argv)
/* Initialize variables */ /* Initialize variables */
status.dwWin32ExitCode = S_OK; status.dwWin32ExitCode = S_OK;
status.dwCheckPoint = 0; status.dwCheckPoint = 0;
status.dwWaitHint = 0; status.dwWaitHint = 60000;
status.dwServiceType = SERVICE_WIN32_OWN_PROCESS; status.dwServiceType = SERVICE_WIN32_OWN_PROCESS;
status.dwControlsAccepted = SERVICE_ACCEPT_STOP|SERVICE_ACCEPT_PAUSE_CONTINUE; status.dwControlsAccepted = SERVICE_ACCEPT_STOP|SERVICE_ACCEPT_SHUTDOWN|SERVICE_ACCEPT_PAUSE_CONTINUE;
status.dwServiceSpecificExitCode = 0; status.dwServiceSpecificExitCode = 0;
status.dwCurrentState = SERVICE_START_PENDING; status.dwCurrentState = SERVICE_START_PENDING;
@ -1000,7 +1006,15 @@ static void WINAPI pgwin32_ServiceMain(DWORD argc, LPTSTR *argv)
{ {
case WAIT_OBJECT_0: /* shutdown event */ case WAIT_OBJECT_0: /* shutdown event */
kill(postmasterPID,SIGINT); kill(postmasterPID,SIGINT);
WaitForSingleObject(postmasterProcess,INFINITE);
/*
* Increment the checkpoint and try again
* Abort after 12 checkpoints as the postmaster has probably hung
*/
while (WaitForSingleObject(postmasterProcess,5000) == WAIT_TIMEOUT && status.dwCheckPoint < 12)
{
status.dwCheckPoint++;
}
break; break;
case (WAIT_OBJECT_0+1): /* postmaster went down */ case (WAIT_OBJECT_0+1): /* postmaster went down */