mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix pgbench progress report behaviour when pgbench or a query gets stuck.

Browse Source 
There were two issues here. First, if a query got stuck so that it took
e.g. 5 seconds, and progress interval was 1 second, no progress reports were
printed until the query returned. Fix so that we wake up specifically to
print the progress report. Secondly, if pgbench got stuck so that it would
nevertheless not print a progress report on time, and enough time passes
that it's already time to print the next progress report, just skip the one
that was missed. Before this patch, it would print the missed one with 0 TPS
immediately after the previous one.

Fabien Coelho. Backpatch to 9.4, where progress reports were added.
This commit is contained in:
Heikki Linnakangas 2015-07-03 11:04:57 +03:00
parent ba3deeefb0
commit 9031ff91a1
1 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3649,6 +3649,33 @@ threadRun(void *arg)
maxsock = sock;
}
/* also wake up to print the next progress report on time */
if (progress && min_usec > 0
#if !defined(PTHREAD_FORK_EMULATION)
&& thread->tid == 0
#endif /* !PTHREAD_FORK_EMULATION */
)
{
/* get current time if needed */
if (now_usec == 0)
{
instr_time now;
INSTR_TIME_SET_CURRENT(now);
now_usec = INSTR_TIME_GET_MICROSEC(now);
}
if (now_usec >= next_report)
min_usec = 0;
else if ((next_report - now_usec) < min_usec)
min_usec = next_report - now_usec;
}
/*
* Sleep until we receive data from the server, or a nap-time
* specified in the script ends, or it's time to print a progress
* report.
*/
if (min_usec > 0 && maxsock != -1)
{
int nsocks; /* return from select(2) */
@ -3754,7 +3781,15 @@ threadRun(void *arg)
last_lags = lags;
last_report = now;
last_skipped = thread->throttle_latency_skipped;
next_report += (int64) progress *1000000;
/*
* Ensure that the next report is in the future, in case
* pgbench/postgres got stuck somewhere.
*/
do
{
next_report += (int64) progress *1000000;
} while (now >= next_report);
}
}
#else
@ -3818,7 +3853,15 @@ threadRun(void *arg)
last_lags = lags;
last_report = now;
last_skipped = thread->throttle_latency_skipped;
next_report += (int64) progress *1000000;
/*
* Ensure that the next report is in the future, in case
* pgbench/postgres got stuck somewhere.
*/
do
{
next_report += (int64) progress *1000000;
} while (now >= next_report);
}
}
#endif /* PTHREAD_FORK_EMULATION */