database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-10-29 22:49:41 +03:00
Code Activity

pg_regress: Promptly detect failed postmaster startup.

Browse Source 
Detect it the way pg_ctl's wait_for_postmaster() does.  When pg_regress
spawned a postmaster that failed startup, we were detecting that only
with "pg_regress: postmaster did not respond within 60 seconds".
Back-patch to 9.4 (all supported versions).

Reviewed by Tom Lane.

Discussion: https://postgr.es/m/20181231172922.GA199150@gust.leadboat.com
This commit is contained in:
Noah Misch
2018-12-31 13:50:32 -08:00
parent 2602838fa3
commit 309d16f073
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/regress/pg_regress.c
View File

@@ -2577,7 +2577,7 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
* Fail immediately if postmaster has exited * Fail immediately if postmaster has exited
*/ */
#ifndef WIN32 #ifndef WIN32
if (kill(postmaster_pid, 0) != 0) if (waitpid(postmaster_pid, NULL, WNOHANG) == postmaster_pid)
#else #else
if (WaitForSingleObject(postmaster_pid, 0) == WAIT_OBJECT_0) if (WaitForSingleObject(postmaster_pid, 0) == WAIT_OBJECT_0)
#endif #endif