NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commitcbabb70

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 parentb4e0f18 commitcbabb70Copy full SHA for cbabb70

File tree

1 file changed

+21

-6

lines changed

src/test/regress
- pg_regress.c

1 file changed

+21

-6

lines changed

`‎src/test/regress/pg_regress.c`

Lines changed: 21 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -2185,6 +2185,8 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc`
`2185`	`2185`	`if (temp_instance)`
`2186`	`2186`	`{`
`2187`	`2187`	`FILE*pg_conf;`
	`2188`	`+constchar*env_wait;`
	`2189`	`+intwait_seconds;`
`2188`	`2190`
`2189`	`2191`	`/*`
`2190`	`2192`	`* Prepare the temp instance`
`@@ -2335,11 +2337,23 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc`
`2335`	`2337`	`}`
`2336`	`2338`
`2337`	`2339`	`/*`
`2338`		`- * Wait till postmaster is able to accept connections (normally only a`
`2339`		`- * second or so, but Cygwin is reportedly much slower). Don't wait`
`2340`		`- * forever, however.`
	`2340`	`+ * Wait till postmaster is able to accept connections; normally this`
	`2341`	`+ * is only a second or so, but Cygwin is reportedly much slower, and`
	`2342`	`+ * test builds using Valgrind or similar tools might be too. Hence,`
	`2343`	`+ * allow the default timeout of 60 seconds to be overridden from the`
	`2344`	`+ * PGCTLTIMEOUT environment variable.`
`2341`	`2345`	`*/`
`2342`		`-for (i=0;i<60;i++)`
	`2346`	`+env_wait=getenv("PGCTLTIMEOUT");`
	`2347`	`+if (env_wait!=NULL)`
	`2348`	`+{`
	`2349`	`+wait_seconds=atoi(env_wait);`
	`2350`	`+if (wait_seconds <=0)`
	`2351`	`+wait_seconds=60;`
	`2352`	`+}`
	`2353`	`+else`
	`2354`	`+wait_seconds=60;`
	`2355`	`+`
	`2356`	`+for (i=0;i<wait_seconds;i++)`
`2343`	`2357`	`{`
`2344`	`2358`	`/* Done if psql succeeds */`
`2345`	`2359`	`if (system(buf2)==0)`
`@@ -2360,9 +2374,10 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc`
`2360`	`2374`
`2361`	`2375`	`pg_usleep(1000000L);`
`2362`	`2376`	`}`
`2363`		`-if (i >=60)`
	`2377`	`+if (i >=wait_seconds)`
`2364`	`2378`	`{`
`2365`		`-fprintf(stderr,_("\n%s: postmaster did not respond within 60 seconds\nExamine %s/log/postmaster.log for the reason\n"),progname,outputdir);`
	`2379`	`+fprintf(stderr,_("\n%s: postmaster did not respond within %d seconds\nExamine %s/log/postmaster.log for the reason\n"),`
	`2380`	`+progname,wait_seconds,outputdir);`
`2366`	`2381`
`2367`	`2382`	`/*`
`2368`	`2383`	`* If we get here, the postmaster is probably wedged somewhere in`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitcbabb70

File tree

1 file changed

1 file changed

`‎src/test/regress/pg_regress.c`

0 commit comments