NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commitaccf761

committed

pgbench: When -T is used, don't wait for transactions beyond end of run.

At low rates, this can lead to pgbench taking significantly longer toterminate than the user might expect. Repair.Fabien Coelho, reviewed by Aleksander Alekseev, Álvaro Herrera, and me.

1 parent188f359 commitaccf761Copy full SHA for accf761

File tree

1 file changed

+14

-0

lines changed

src/bin/pgbench
- pgbench.c

1 file changed

+14

-0

lines changed

`‎src/bin/pgbench/pgbench.c`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,7 @@ static intpthread_join(pthread_t th, void **thread_return);`
`94`	`94`
`95`	`95`	`intnxacts=0;/* number of transactions per client */`
`96`	`96`	`intduration=0;/* duration in seconds */`
	`97`	`+int64end_time=0;/* when to stop in micro seconds, under -T */`
`97`	`98`
`98`	`99`	`/*`
`99`	`100`	`* scaling factor. for example, scale = 10 will make 1000000 tuples in`
`@@ -1362,6 +1363,10 @@ doCustom(TState thread, CState st, StatsData *agg)`
`1362`	`1363`	`thread->throttle_trigger+=wait;`
`1363`	`1364`	`st->txn_scheduled=thread->throttle_trigger;`
`1364`	`1365`
	`1366`	`+/* stop client if next transaction is beyond pgbench end of execution */`
	`1367`	`+if (duration>0&&st->txn_scheduled>end_time)`
	`1368`	`+returnclientDone(st, true);`
	`1369`	`+`
`1365`	`1370`	`/*`
`1366`	`1371`	`* If this --latency-limit is used, and this slot is already late so`
`1367`	`1372`	`* that the transaction will miss the latency limit even if it`
`@@ -3582,6 +3587,11 @@ main(int argc, char **argv)`
`3582`	`3587`
`3583`	`3588`	`INSTR_TIME_SET_CURRENT(thread->start_time);`
`3584`	`3589`
	`3590`	`+/* compute when to stop */`
	`3591`	`+if (duration>0)`
	`3592`	`+end_time=INSTR_TIME_GET_MICROSEC(thread->start_time)+`
	`3593`	`+(int64)1000000*duration;`
	`3594`	`+`
`3585`	`3595`	`/* the first thread (i = 0) is executed by main thread */`
`3586`	`3596`	`if (i>0)`
`3587`	`3597`	`{`
`@@ -3600,6 +3610,10 @@ main(int argc, char **argv)`
`3600`	`3610`	`}`
`3601`	`3611`	`#else`
`3602`	`3612`	`INSTR_TIME_SET_CURRENT(threads[0].start_time);`
	`3613`	`+/* compute when to stop */`
	`3614`	`+if (duration>0)`
	`3615`	`+end_time=INSTR_TIME_GET_MICROSEC(threads[0].start_time)+`
	`3616`	`+(int64)1000000*duration;`
`3603`	`3617`	`threads[0].thread=INVALID_THREAD;`
`3604`	`3618`	`#endif/* ENABLE_THREAD_SAFETY */`
`3605`	`3619`

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!

Commitaccf761

File tree

1 file changed

1 file changed

`‎src/bin/pgbench/pgbench.c`

0 commit comments