diff options
| author | Noah Misch <noah@leadboat.com> | 2018-12-31 13:50:32 -0800 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2018-12-31 13:51:30 -0800 |
| commit | 309d16f073fdbc8b5da6a8a7ff4afad01c78e7f6 (patch) | |
| tree | 3b7e219e862d841d6ab71bd2219ad00c8313293b /src | |
| parent | 2602838fa33824a0803f3b1f3814889ac7e93192 (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
Diffstat (limited to 'src')
| -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 eb889f388ce..2290bacffeb 100644 --- a/src/test/regress/pg_regress.c +++ b/src/test/regress/pg_regress.c @@ -2577,7 +2577,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 |