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:18 -0800 |
| commit | 7c97b0f55e751297a5e30c0de28a779b945aa706 (patch) | |
| tree | 9457f1ffa0aa2e2ff427891dac9f70bd4cdafc84 /src | |
| parent | af99ad191a3cee6fd565552574acb07fad53eb37 (diff) | |
| download | postgresql-7c97b0f55e751297a5e30c0de28a779b945aa706.tar.gz postgresql-7c97b0f55e751297a5e30c0de28a779b945aa706.zip | |
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 acf26821d79..5d08d1e12e5 100644 --- a/src/test/regress/pg_regress.c +++ b/src/test/regress/pg_regress.c @@ -2390,7 +2390,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 |