NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit834cb72

committed

Remove dry-run mode from isolationtester

The original purpose of the dry-run mode is to be able to print all thepossible permutations from a spec file, but it has become less usefulsince isolation tests have improved regarding deadlock detection as onestep not wanted by the author could block indefinitely now (originallythe step blocked would have been detected rather quickly). Perdiscussion, let's remove it.This is a backpatch of9903338 for 9.6~12. It is proving to becomeuseful to have on those branches so as the code gets consistent acrossall supported versions, as a matter of improving the output generated byisolationtester.Author: Michael PaquierReviewed-by: Asim Praveen, Melanie PlagemanDiscussion:https://postgr.es/m/20190819080820.GG18166@paquier.xyzDiscussion:https://postgr.es/m/794820.1623872009@sss.pgh.pa.usBackpatch-through: 9.6

1 parent9cf1632 commit834cb72Copy full SHA for 834cb72

File tree

1 file changed

-30

lines changed

src/test/isolation
- isolationtester.c

1 file changed

-30

lines changed

`‎src/test/isolation/isolationtester.c`

Lines changed: 1 addition & 30 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,6 @@ static int *backend_pids = NULL;`
`31`	`31`	`staticconstchar**backend_pid_strs=NULL;`
`32`	`32`	`staticintnconns=0;`
`33`	`33`
`34`		`-/* In dry run only output permutations to be run by the tester. */`
`35`		`-staticintdry_run= false;`
`36`		`-`
`37`	`34`	`/* Maximum time to wait before giving up on a step (in usec) */`
`38`	`35`	`staticint64max_step_wait=300*USECS_PER_SEC;`
`39`	`36`
`@@ -83,13 +80,10 @@ main(int argc, char **argv)`
`83`	`80`	`intnallsteps;`
`84`	`81`	`Step**allsteps;`
`85`	`82`
`86`		`-while ((opt=getopt(argc,argv,"nV"))!=-1)`
	`83`	`+while ((opt=getopt(argc,argv,"V"))!=-1)`
`87`	`84`	`{`
`88`	`85`	`switch (opt)`
`89`	`86`	`{`
`90`		`-case'n':`
`91`		`-dry_run= true;`
`92`		`-break;`
`93`	`87`	`case'V':`
`94`	`88`	`puts("isolationtester (PostgreSQL) "PG_VERSION);`
`95`	`89`	`exit(0);`
`@@ -159,16 +153,6 @@ main(int argc, char **argv)`
`159`	`153`	`}`
`160`	`154`	`}`
`161`	`155`
`162`		`-/*`
`163`		`- * In dry-run mode, just print the permutations that would be run, and`
`164`		`- * exit.`
`165`		`- */`
`166`		`-if (dry_run)`
`167`		`-{`
`168`		`-run_testspec(testspec);`
`169`		`-return0;`
`170`		`-}`
`171`		`-`
`172`	`156`	`printf("Parsed test spec with %d sessions\n",testspec->nsessions);`
`173`	`157`
`174`	`158`	`/*`
`@@ -466,19 +450,6 @@ run_permutation(TestSpec testspec, int nsteps, Step *steps)`
`466`	`450`	`Step**waiting;`
`467`	`451`	`Step**errorstep;`
`468`	`452`
`469`		`-/*`
`470`		`- * In dry run mode, just display the permutation in the same format used`
`471`		`- * by spec files, and return.`
`472`		`- */`
`473`		`-if (dry_run)`
`474`		`-{`
`475`		`-printf("permutation");`
`476`		`-for (i=0;i<nsteps;i++)`
`477`		`-printf(" \"%s\"",steps[i]->name);`
`478`		`-printf("\n");`
`479`		`-return;`
`480`		`-}`
`481`		`-`
`482`	`453`	`waiting=pg_malloc(sizeof(Step)testspec->nsessions);`
`483`	`454`	`errorstep=pg_malloc(sizeof(Step)testspec->nsessions);`
`484`	`455`

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!

Commit834cb72

File tree

1 file changed

1 file changed

`‎src/test/isolation/isolationtester.c`

0 commit comments