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

diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index 9b9fbe8d245c0c5be2e6000840327eee7f79c586..b3970d99e178b2468a7287d9389acb27f8508208 100644 (file)
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -1503,15 +1503,27 @@ pgwin32_ServiceMain(DWORD argc, LPTSTR *argv)
        switch (ret)
        {
                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;;
 
-                       /*
-                        * 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;
+                               kill(postmasterPID, SIGINT);
+
+                               /*
+                                * Increment the checkpoint and try again. Abort after 12
+                                * checkpoints as the postmaster has probably hung.
+                                */
+                               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 */
                        break;