forked frompostgres/postgres
- Notifications
You must be signed in to change notification settings - Fork6
Commit0bae3bc
committed
Improve corner cases in pg_ctl's new wait-for-postmaster-startup code.
With "-w -t 0", we should report "still starting up", not "ok". If wefall out of the loop without ever being able to call PQping (because wewere never able to construct a connection string), report "no response",not "ok". This gets rid of corner cases in which we'd claim the serverhad started even though it had not.Also, if the postmaster.pid file is not there at any point after we'vewaited 5 seconds, assume the postmaster has failed and report that, ratherthan almost-certainly-fruitlessly continuing to wait. The pidfile shouldappear almost instantly even when there is extensive startup work to do,so 5 seconds is already a very conservative figure. This part is per agripe from MauMau --- there might be better ways to do it, but nothingsimple enough to get done for 9.1.1 parent90857b4 commit0bae3bc
1 file changed
+18
-1
lines changedLines changed: 18 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
411 | 411 |
| |
412 | 412 |
| |
413 | 413 |
| |
414 |
| - | |
| 414 | + | |
415 | 415 |
| |
416 | 416 |
| |
417 | 417 |
| |
| 418 | + | |
| 419 | + | |
| 420 | + | |
| 421 | + | |
418 | 422 |
| |
419 | 423 |
| |
420 | 424 |
| |
| |||
538 | 542 |
| |
539 | 543 |
| |
540 | 544 |
| |
| 545 | + | |
| 546 | + | |
| 547 | + | |
| 548 | + | |
| 549 | + | |
| 550 | + | |
| 551 | + | |
| 552 | + | |
| 553 | + | |
| 554 | + | |
| 555 | + | |
| 556 | + | |
| 557 | + | |
541 | 558 |
| |
542 | 559 |
| |
543 | 560 |
| |
|
0 commit comments
Comments
(0)