mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-27 08:39:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Loop calling CallNamedPipe() several times in case it fails,

Browse Source 
since it can be transient failures, causing kill() to not
properly send signals.

Original patch from Steve Marshall, modified by me.
This commit is contained in:
Magnus Hagander 2009-02-15 13:58:20 +00:00
parent 9692582610
commit 37a8cc3240
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/port/kill.c
View File

@ -9,7 +9,7 @@
* signals that the backend can recognize. * signals that the backend can recognize.
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/port/kill.c,v 1.7 2006/03/05 15:59:10 momjian Exp $ * $PostgreSQL: pgsql/src/port/kill.c,v 1.7.2.1 2009/02/15 13:58:20 mha Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -25,6 +25,7 @@ pgkill(int pid, int sig)
BYTE sigData = sig; BYTE sigData = sig;
BYTE sigRet = 0; BYTE sigRet = 0;
DWORD bytes; DWORD bytes;
int pipe_tries;
/* we allow signal 0 here, but it will be ignored in pg_queue_signal */ /* we allow signal 0 here, but it will be ignored in pg_queue_signal */
if (sig >= PG_SIGNAL_COUNT || sig < 0) if (sig >= PG_SIGNAL_COUNT || sig < 0)
@ -38,24 +39,34 @@ pgkill(int pid, int sig)
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
wsprintf(pipename, "\\\\.\\pipe\\pgsignal_%i", pid); snprintf(pipename, sizeof(pipename), "\\\\.\\pipe\\pgsignal_%u", pid);
if (!CallNamedPipe(pipename, &sigData, 1, &sigRet, 1, &bytes, 1000))
/*
* Writing data to the named pipe can fail for transient reasons.
* Therefore, it is useful to retry if it fails. The maximum number of
* calls to make was empirically determined from a 90-hour notification
* stress test.
*/
for (pipe_tries = 0; pipe_tries < 3; pipe_tries++)
{ {
if (GetLastError() == ERROR_FILE_NOT_FOUND) if (CallNamedPipe(pipename, &sigData, 1, &sigRet, 1, &bytes, 1000))
errno = ESRCH; {
else if (GetLastError() == ERROR_ACCESS_DENIED) if (bytes != 1 || sigRet != sig)
errno = EPERM; {
else errno = ESRCH;
errno = EINVAL; return -1;
return -1; }
} return 0;
if (bytes != 1 || sigRet != sig) }
{
errno = ESRCH;
return -1;
} }
return 0; if (GetLastError() == ERROR_FILE_NOT_FOUND)
errno = ESRCH;
else if (GetLastError() == ERROR_ACCESS_DENIED)
errno = EPERM;
else
errno = EINVAL;
return -1;
} }
#endif #endif