forked frompostgres/postgres
- Notifications
You must be signed in to change notification settings - Fork6
Commit0b8e0bf
committed
Honor PGCTLTIMEOUT environment variable for pg_regress' startup wait.
In commit2ffa869 we made pg_ctl recognize an environment variablePGCTLTIMEOUT to set the default timeout for starting and stopping thepostmaster. However, pg_regress uses pg_ctl only for the "stop" end ofthat; it has bespoke code for starting the postmaster, and that code hashistorically had a hard-wired 60-second timeout. Further buildfarmexperience says it'd be a good idea if that timeout were also controlledby PGCTLTIMEOUT, so let's make it so. Like the previous patch, back-patchto all active branches.Discussion: <13969.1461191936@sss.pgh.pa.us>1 parentbe27544 commit0b8e0bf
1 file changed
+21
-6
lines changedLines changed: 21 additions & 6 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
2185 | 2185 |
| |
2186 | 2186 |
| |
2187 | 2187 |
| |
| 2188 | + | |
| 2189 | + | |
2188 | 2190 |
| |
2189 | 2191 |
| |
2190 | 2192 |
| |
| |||
2334 | 2336 |
| |
2335 | 2337 |
| |
2336 | 2338 |
| |
2337 |
| - | |
2338 |
| - | |
2339 |
| - | |
| 2339 | + | |
| 2340 | + | |
| 2341 | + | |
| 2342 | + | |
| 2343 | + | |
2340 | 2344 |
| |
2341 |
| - | |
| 2345 | + | |
| 2346 | + | |
| 2347 | + | |
| 2348 | + | |
| 2349 | + | |
| 2350 | + | |
| 2351 | + | |
| 2352 | + | |
| 2353 | + | |
| 2354 | + | |
| 2355 | + | |
2342 | 2356 |
| |
2343 | 2357 |
| |
2344 | 2358 |
| |
| |||
2359 | 2373 |
| |
2360 | 2374 |
| |
2361 | 2375 |
| |
2362 |
| - | |
| 2376 | + | |
2363 | 2377 |
| |
2364 |
| - | |
| 2378 | + | |
| 2379 | + | |
2365 | 2380 |
| |
2366 | 2381 |
| |
2367 | 2382 |
| |
|
0 commit comments
Comments
(0)