rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-09-28 21:01:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
At low rates, this can lead to pgbench taking significantly longer to
terminate than the user might expect.  Repair.

Fabien Coelho, reviewed by Aleksander Alekseev, Álvaro Herrera, and me.
This commit is contained in:
Robert Haas 2016-03-09 13:09:12 -05:00
parent 188f359d39
commit accf7616ff
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/bin/pgbench/pgbench.c
View File

@ -94,6 +94,7 @@ static int pthread_join(pthread_t th, void **thread_return);
int nxacts = 0; /* number of transactions per client */
int duration = 0; /* duration in seconds */
int64 end_time = 0; /* when to stop in micro seconds, under -T */
/*
* scaling factor. for example, scale = 10 will make 1000000 tuples in
@ -1362,6 +1363,10 @@ top:
thread->throttle_trigger += wait;
st->txn_scheduled = thread->throttle_trigger;
/* stop client if next transaction is beyond pgbench end of execution */
if (duration > 0 && st->txn_scheduled > end_time)
return clientDone(st, true);
/*
* If this --latency-limit is used, and this slot is already late so
* that the transaction will miss the latency limit even if it
@ -3582,6 +3587,11 @@ main(int argc, char **argv)
INSTR_TIME_SET_CURRENT(thread->start_time);
/* compute when to stop */
if (duration > 0)
end_time = INSTR_TIME_GET_MICROSEC(thread->start_time) +
(int64) 1000000 * duration;
/* the first thread (i = 0) is executed by main thread */
if (i > 0)
{
@ -3600,6 +3610,10 @@ main(int argc, char **argv)
}
#else
INSTR_TIME_SET_CURRENT(threads[0].start_time);
/* compute when to stop */
if (duration > 0)
end_time = INSTR_TIME_GET_MICROSEC(threads[0].start_time) +
(int64) 1000000 * duration;
threads[0].thread = INVALID_THREAD;
#endif /* ENABLE_THREAD_SAFETY */