Fix pgbench options -C and -R together

feodor · feodor · commit 2ed391f95b34 · 2017-03-24T19:23:13.000+03:00
The bug is that prior to --rate doCustom was always disconnect/reconnect without exiting, but with rate it returns if it has to wait. However threadRun test whether there is a connection before recalling doCustom, so it was never called. Bug is not existed in head branch because of refactoring at 12788ae, patch only 9.6 Author: Fabien Coelho Reviewed-by: me https://commitfest.postgresql.org/13/970/
diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
@@ -1967,7 +1967,6 @@ doCustom(TState *thread, CState *st, StatsData *agg)
 		st->listen = false;
 		st->sleeping = false;
 		st->throttling = false;
-		st->is_throttled = false;
 		memset(st->prepared, 0, sizeof(st->prepared));
 	}
 
@@ -4345,6 +4344,12 @@ threadRun(void *arg)
 						remains--;		/* I've aborted */
 				}
 			}
+			else if (is_connect && st->sleeping)
+			{
+				/* it is sleeping for throttling, maybe it is done, let us try */
+				if (!doCustom(thread, st, &aggs))
+					remains--;
+			}
 
 			if (st->ecnt > prev_ecnt && commands[st->state]->type == META_COMMAND)
 			{

Original file line number	Diff line number	Diff line change
`@@ -1967,7 +1967,6 @@ doCustom(TState thread, CState st, StatsData *agg)`
`1967`	`1967`	`st->listen = false;`
`1968`	`1968`	`st->sleeping = false;`
`1969`	`1969`	`st->throttling = false;`
`1970`		`- st->is_throttled = false;`
`1971`	`1970`	`memset(st->prepared, 0, sizeof(st->prepared));`
`1972`	`1971`	`}`
`1973`	`1972`
`@@ -4345,6 +4344,12 @@ threadRun(void *arg)`
`4345`	`4344`	`remains--; /* I've aborted */`
`4346`	`4345`	`}`
`4347`	`4346`	`}`
	`4347`	`+ else if (is_connect && st->sleeping)`
	`4348`	`+ {`
	`4349`	`+ /* it is sleeping for throttling, maybe it is done, let us try */`
	`4350`	`+ if (!doCustom(thread, st, &aggs))`
	`4351`	`+ remains--;`
	`4352`	`+ }`
`4348`	`4353`
`4349`	`4354`	`if (st->ecnt > prev_ecnt && commands[st->state]->type == META_COMMAND)`
`4350`	`4355`	`{`