diff options
| author | Noah Misch | 2018-12-31 21:50:32 +0000 |
|---|---|---|
| committer | Noah Misch | 2018-12-31 21:51:23 +0000 |
| commit | 13602a9b6b72d0152200a146fef16e12d7a4a10a (patch) | |
| tree | 1a2dd880eb2326477b14511b23deef63035dc123 | |
| parent | 55fde981c299550d96742799f1bfa36220cc1b7c (diff) | |
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
| -rw-r--r-- | src/test/regress/pg_regress.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c index ab09e898e63..a38a93d78db 100644 --- a/src/test/regress/pg_regress.c +++ b/src/test/regress/pg_regress.c @@ -2359,7 +2359,7 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc * Fail immediately if postmaster has exited */ #ifndef WIN32 - if (kill(postmaster_pid, 0) != 0) + if (waitpid(postmaster_pid, NULL, WNOHANG) == postmaster_pid) #else if (WaitForSingleObject(postmaster_pid, 0) == WAIT_OBJECT_0) #endif |