Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit78ce2dc

Browse files
committed
Properly send SCM status updates when shutting down service on Windows
The Service Control Manager should be notified regularly during a shutdownthat takes a long time. Previously we would increaes the counter, but forgotto actually send the notification to the system. The loop counter was alsoincorrectly initalized in the event that the startup of the system took longenough for it to increase, which could cause the shutdown process not to waitas long as expected.Krystian Bigaj, reviewed by Michael Paquier
1 parentba7bee8 commit78ce2dc

File tree

1 file changed

+20
-8
lines changed

1 file changed

+20
-8
lines changed

‎src/bin/pg_ctl/pg_ctl.c

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1358,15 +1358,27 @@ pgwin32_ServiceMain(DWORD argc, LPTSTR *argv)
13581358
switch (ret)
13591359
{
13601360
caseWAIT_OBJECT_0:/* shutdown event */
1361-
kill(postmasterPID,SIGINT);
1361+
{
1362+
/*
1363+
* status.dwCheckPoint can be incremented by
1364+
* test_postmaster_connection(true), so it might not
1365+
* start from 0.
1366+
*/
1367+
intmaxShutdownCheckPoint=status.dwCheckPoint+12;;
13621368

1363-
/*
1364-
* Increment the checkpoint and try again Abort after 12
1365-
* checkpoints as the postmaster has probably hung
1366-
*/
1367-
while (WaitForSingleObject(postmasterProcess,5000)==WAIT_TIMEOUT&&status.dwCheckPoint<12)
1368-
status.dwCheckPoint++;
1369-
break;
1369+
kill(postmasterPID,SIGINT);
1370+
1371+
/*
1372+
* Increment the checkpoint and try again. Abort after 12
1373+
* checkpoints as the postmaster has probably hung.
1374+
*/
1375+
while (WaitForSingleObject(postmasterProcess,5000)==WAIT_TIMEOUT&&status.dwCheckPoint<maxShutdownCheckPoint)
1376+
{
1377+
status.dwCheckPoint++;
1378+
SetServiceStatus(hStatus, (LPSERVICE_STATUS)&status);
1379+
}
1380+
break;
1381+
}
13701382

13711383
case (WAIT_OBJECT_0+1):/* postmaster went down */
13721384
break;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp