postgres.git / summary / log / commit / refs

commit    f18fcd9a450b64184d74c3ce6cb6fd79a6499c9f
Author:   Fujii Masao <fujii@postgresql.org>
Date:     Thu May 14 03:31:43 2026 +0000

    pgbench: fix verbose error message corruption with multiple threads
    
    When pgbench runs with multiple threads and verbose error reporting is
    enabled (--verbose-errors), multiple clients can build verbose error
    messages concurrently. Previously, a function-local static
    PQExpBuffer was used for these messages, causing the buffer to be
    shared across threads. This was not thread-safe and could result in
    corrupted or incorrect log output.
    
    Fix this by using a local PQExpBufferData instead of a static buffer.
    This keeps verbose error messages correct during concurrent execution.
    
    Backpatch to v15, where this issue was introduced.
    
    Author: Fujii Masao <masao.fujii@gmail.com>
    Reviewed-by: Michael Paquier <michael@paquier.xyz>
    Reviewed-by: Alex Guo <guo.alex.hengchen@gmail.com>
    Reviewed-by: Chao Li <li.evan.chao@gmail.com>
    Discussion: https://postgr.es/m/CAHGQGwER1AjGXpkKB9t9820NBhMQ_Ghv7=HsKeodUr3=SZsF4g@mail.gmail.com
    Backpatch-through: 15


 src/bin/pgbench/pgbench.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
index 80d14108c28..dc0c48f86f0 100644
--- a/src/bin/pgbench/pgbench.c
+++ b/src/bin/pgbench/pgbench.c
@@ -3586,23 +3586,20 @@ getTransactionStatus(PGconn *con)
 static void
 printVerboseErrorMessages(CState *st, pg_time_usec_t *now, bool is_retry)
 {
-	static PQExpBuffer buf = NULL;
+	PQExpBufferData buf;
 
-	if (buf == NULL)
-		buf = createPQExpBuffer();
-	else
-		resetPQExpBuffer(buf);
+	initPQExpBuffer(&buf);
 
-	printfPQExpBuffer(buf, "client %d ", st->id);
-	appendPQExpBuffer(buf, "%s",
+	printfPQExpBuffer(&buf, "client %d ", st->id);
+	appendPQExpBuffer(&buf, "%s",
 					  (is_retry ?
 					   "repeats the transaction after the error" :
 					   "ends the failed transaction"));
-	appendPQExpBuffer(buf, " (try %u", st->tries);
+	appendPQExpBuffer(&buf, " (try %u", st->tries);
 
 	/* Print max_tries if it is not unlimitted. */
 	if (max_tries)
-		appendPQExpBuffer(buf, "/%u", max_tries);
+		appendPQExpBuffer(&buf, "/%u", max_tries);
 
 	/*
 	 * If the latency limit is used, print a percentage of the current
@@ -3611,12 +3608,14 @@ printVerboseErrorMessages(CState *st, pg_time_usec_t *now, bool is_retry)
 	if (latency_limit)
 	{
 		pg_time_now_lazy(now);
-		appendPQExpBuffer(buf, ", %.3f%% of the maximum time of tries was used",
+		appendPQExpBuffer(&buf, ", %.3f%% of the maximum time of tries was used",
 						  (100.0 * (*now - st->txn_scheduled) / latency_limit));
 	}
-	appendPQExpBuffer(buf, ")\n");
+	appendPQExpBuffer(&buf, ")\n");
 
-	pg_log_info("%s", buf->data);
+	pg_log_info("%s", buf.data);
+
+	termPQExpBuffer(&buf);
 }
 
 /*


[parent: f4ba78081895]