database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-05 07:21:24 +03:00
Code Activity

Change aggregated log format of pgbench.

Browse Source 
Commit 4a39f87acd changed the aggregated log format. Problem is, now
the explanatory paragraph for the log line in the document is too
long. Also the log format included more optional columns, and it's
harder to parse the log lines.  This commit tries to solve the
problems.

- There's no optional log columns anymore. If a column is not
  meaningful with provided pgbench option, it will be presented as 0.

- Reorder the log columns so that it's easier to parse them.

- Adjust explanatory paragraph for the log line in the doc.

Discussion: https://postgr.es/m/flat/202203280757.3tu4ovs3petm%40alvherre.pgsql
This commit is contained in:
Tatsuo Ishii
2022-04-06 09:55:58 +09:00
parent e37ad5fa4d
commit 17a856d08b
2 changed files with 82 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4494,6 +4494,17 @@ doLog(TState *thread, CState *st,
while ((next = agg->start_time + agg_interval * INT64CONST(1000000)) <= now)
{
double lag_sum = 0.0;
double lag_sum2 = 0.0;
double lag_min = 0.0;
double lag_max = 0.0;
int64 skipped = 0;
int64 serialization_failures = 0;
int64 deadlock_failures = 0;
int64 serialization_or_deadlock_failures = 0;
int64 retried = 0;
int64 retries = 0;
/* print aggregated report to logfile */
fprintf(logfile, INT64_FORMAT " " INT64_FORMAT " %.0f %.0f %.0f %.0f",
agg->start_time / 1000000, /* seconds since Unix epoch */
@ -4503,27 +4514,41 @@ doLog(TState *thread, CState *st,
agg->latency.min,
agg->latency.max);
if (failures_detailed)
fprintf(logfile, " " INT64_FORMAT " " INT64_FORMAT,
agg->serialization_failures,
agg->deadlock_failures);
else
fprintf(logfile, " " INT64_FORMAT, getFailures(agg));
if (throttle_delay)
{
fprintf(logfile, " %.0f %.0f %.0f %.0f",
agg->lag.sum,
agg->lag.sum2,
agg->lag.min,
agg->lag.max);
if (latency_limit)
fprintf(logfile, " " INT64_FORMAT, agg->skipped);
lag_sum = agg->lag.sum;
lag_sum2 = agg->lag.sum2;
lag_min = agg->lag.min;
lag_max = agg->lag.max;
}
fprintf(logfile, " %.0f %.0f %.0f %.0f",
lag_sum,
lag_sum2,
lag_min,
lag_max);
if (latency_limit)
skipped = agg->skipped;
fprintf(logfile, " " INT64_FORMAT, skipped);
if (max_tries != 1)
fprintf(logfile, " " INT64_FORMAT " " INT64_FORMAT,
agg->retried,
agg->retries);
{
retried = agg->retried;
retries = agg->retries;
}
fprintf(logfile, " " INT64_FORMAT " " INT64_FORMAT, retried, retries);
if (failures_detailed)
{
serialization_failures = agg->serialization_failures;
deadlock_failures = agg->deadlock_failures;
}
serialization_or_deadlock_failures = serialization_failures + deadlock_failures;
fprintf(logfile, " " INT64_FORMAT " " INT64_FORMAT " " INT64_FORMAT,
serialization_or_deadlock_failures,
serialization_failures,
deadlock_failures);
fputc('\n', logfile);
/* reset data and move to next interval */