mirror of
https://github.com/postgres/postgres.git
synced 2026-10-23 13:29:09 +03:00
Fix poll_query_until() timeout handling with an undefined query in Cluster.pm
On timeout, poll_query_until() would fail to print its report when "$query" was undefined. Instead of the expected report, this prevented the contents of stdout and stderr from being shown. Note that some of the in-core tests use an undefined query for connection-only polls. Author: Bryan Green <dbryan.green@gmail.com> Reviewed-by: Jonathan Gonzalez V. <jonathan.abdiel@gmail.com> Discussion: https://postgr.es/m/0f515c6d-6032-4c5f-80ac-5c78faae9522@gmail.com Backpatch-through: 14
This commit is contained in:
@@ -2808,8 +2808,10 @@ sub poll_query_until
|
||||
|
||||
# Give up. Print the output from the last attempt, hopefully that's useful
|
||||
# for debugging.
|
||||
my $msg_query = $query;
|
||||
$msg_query = '(connection attempt only)' unless defined $query;
|
||||
diag qq(poll_query_until timed out executing this query:
|
||||
$query
|
||||
$msg_query
|
||||
expecting this output:
|
||||
$expected
|
||||
last actual query output:
|
||||
|
||||
Reference in New Issue
Block a user