Skip to content

Commit 309d16f

Browse files
committed
pg_regress: Promptly detect failed postmaster startup.
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
1 parent 2602838 commit 309d16f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/test/regress/pg_regress.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2577,7 +2577,7 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
25772577
* Fail immediately if postmaster has exited
25782578
*/
25792579
#ifndef WIN32
2580-
if (kill(postmaster_pid, 0) != 0)
2580+
if (waitpid(postmaster_pid, NULL, WNOHANG) == postmaster_pid)
25812581
#else
25822582
if (WaitForSingleObject(postmaster_pid, 0) == WAIT_OBJECT_0)
25832583
#endif

0 commit comments

Comments
 (0)