Commit 1a241d22 authored by Magnus Hagander's avatar Magnus Hagander

Properly send SCM status updates when shutting down service on Windows

The Service Control Manager should be notified regularly during a shutdown
that takes a long time. Previously we would increaes the counter, but forgot
to actually send the notification to the system. The loop counter was also
incorrectly initalized in the event that the startup of the system took long
enough for it to increase, which could cause the shutdown process not to wait
as long as expected.

Krystian Bigaj, reviewed by Michael Paquier
parent d678bde6
...@@ -1597,15 +1597,27 @@ pgwin32_ServiceMain(DWORD argc, LPTSTR *argv) ...@@ -1597,15 +1597,27 @@ pgwin32_ServiceMain(DWORD argc, LPTSTR *argv)
switch (ret) switch (ret)
{ {
case WAIT_OBJECT_0: /* shutdown event */ case WAIT_OBJECT_0: /* shutdown event */
kill(postmasterPID, SIGINT); {
/*
* status.dwCheckPoint can be incremented by
* test_postmaster_connection(true), so it might not
* start from 0.
*/
int maxShutdownCheckPoint = status.dwCheckPoint + 12;;
/* kill(postmasterPID, SIGINT);
* Increment the checkpoint and try again Abort after 12
* checkpoints as the postmaster has probably hung /*
*/ * Increment the checkpoint and try again. Abort after 12
while (WaitForSingleObject(postmasterProcess, 5000) == WAIT_TIMEOUT && status.dwCheckPoint < 12) * checkpoints as the postmaster has probably hung.
status.dwCheckPoint++; */
break; while (WaitForSingleObject(postmasterProcess, 5000) == WAIT_TIMEOUT && status.dwCheckPoint < maxShutdownCheckPoint)
{
status.dwCheckPoint++;
SetServiceStatus(hStatus, (LPSERVICE_STATUS) &status);
}
break;
}
case (WAIT_OBJECT_0 + 1): /* postmaster went down */ case (WAIT_OBJECT_0 + 1): /* postmaster went down */
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment