From: Fabien COELHO <coelho@cri.ensmp.fr>
To: Tom Lane <tgl@sss.pgh.pa.us>
Cc: Peter Eisentraut <peter.eisentraut@enterprisedb.com>
Cc: Daniel Gustafsson <daniel@yesql.se>
Cc: pgsql-committers@lists.postgresql.org
Subject: Re: pgsql: psql: Add test for query canceling
Date: Wed, 25 Aug 2021 07:37:22 +0200 (CEST)
Message-ID: <alpine.DEB.2.22.394.2108250705270.2232211@pseudo> (raw)
In-Reply-To: <350197.1629824350@sss.pgh.pa.us>
References: <E1mH14Q-0002gh-HS@gemulon.postgresql.org>
<DD279DFC-DD59-458E-B469-75DC941765A4@yesql.se>
<alpine.DEB.2.22.394.2108201736060.498998@pseudo>
<5F16EBAA-30D3-4C0D-840C-C2FF2739E370@yesql.se>
<1957503.1629485278@sss.pgh.pa.us>
<9f46b102-da4d-8312-54f0-1f3bc10b453c@enterprisedb.com>
<350197.1629824350@sss.pgh.pa.us>
> That looks pretty solid to me, and I can confirm that it passes
> on wrasse's host. The only nit I can find to pick is that this:
>
> + usleep(10_000) until -s "$tempdir/psql.pid" or ($count++ > 180 * 100 and die 'pid file did not appear');
>
> basically assumes that psql.pid will be written atomically.
> It'd be marginally safer to wait till psql.pid can be seen to
> contain a newline. I don't think that would be too hard to do,
> if you put the slurp_file call inside the wait loop and inspect
> its result.
I finally came around to have a look at the patch.
For the issue raised above, I can see that the file could be created but
not yet written, but as the patch waits for the file to be non zero, ISTM
that the probability of a torn write of a single integer by echo is so
remote that we could let it as that?
Attached a version with the slurping in the loop anyway.
--
Fabien.
Attachments:0001-Make-psql-cancel-test-more-timing-robust-2.patch (text/x-diff, 2.1K) downloaddiff --git a/src/bin/psql/t/020_cancel.pl b/src/bin/psql/t/020_cancel.plindex 7713fff8e4..545ce57ead 100644--- a/src/bin/psql/t/020_cancel.pl+++ b/src/bin/psql/t/020_cancel.pl@@ -7,6 +7,7 @@ use warnings;
use PostgresNode;
use TestLib;
use Test::More tests => 2;
+use Time::HiRes qw(usleep);
my $tempdir = TestLib::tempdir;
@@ -28,19 +29,35 @@ SKIP: {
my ($stdin, $stdout, $stderr);
# Test whether shell supports $PPID. It's part of POSIX, but some
- # pre-/non-POSIX shells don't support it (e.g., NetBSD, Solaris).+ # pre-/non-POSIX shells don't support it (e.g., NetBSD).
$stdin = "\\! echo \$PPID";
IPC::Run::run(['psql', '-X', '-v', 'ON_ERROR_STOP=1'], '<', \$stdin, '>', \$stdout, '2>', \$stderr);
$stdout =~ /^\d+$/ or skip "shell apparently does not support \$PPID", 2;
- local $SIG{ALRM} = sub {- my $psql_pid = TestLib::slurp_file("$tempdir/psql.pid");- kill 'INT', $psql_pid;- };- alarm 1;-- $stdin = "\\! echo \$PPID >$tempdir/psql.pid\nselect pg_sleep(3);";- my $result = IPC::Run::run(['psql', '-X', '-v', 'ON_ERROR_STOP=1'], '<', \$stdin, '>', \$stdout, '2>', \$stderr);+ # Now start the real test+ my $h = IPC::Run::start(['psql', '-X', '-v', 'ON_ERROR_STOP=1'], \$stdin, \$stdout, \$stderr);++ # Get the PID+ $stdout = '';+ $stderr = '';+ $stdin = "\\! echo \$PPID >$tempdir/psql.pid\n";+ pump $h while length $stdin;+ my $count;+ my $psql_pid;+ usleep(10_000)+ until (-s "$tempdir/psql.pid" and ($psql_pid = TestLib::slurp_file("$tempdir/psql.pid")) =~ /^\d+\n/s)+ or ($count++ > 180 * 100 and die 'pid file did not appear');++ # Send sleep command and wait until the server has registered it+ $stdin = "select pg_sleep(180);\n";+ pump $h while length $stdin;+ $node->poll_query_until('postgres', q{SELECT (SELECT count(*) FROM pg_stat_activity WHERE query ~ 'pg_sleep') > 0;})+ or die "timed out";++ # Send cancel request+ kill 'INT', $psql_pid;++ my $result = finish $h;
ok(!$result, 'query failed as expected');
like($stderr, qr/canceling statement due to user request/, 'query was canceled');
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients from your mail client; the link fills in
the headers below: reply via email
Some clients, webmail especially, drop In-Reply-To and References from
a link, and the reply then starts a new thread: use the mbox below.
To: pgsql-committers@postgresql.org
Cc: coelho@cri.ensmp.fr, tgl@sss.pgh.pa.us, peter.eisentraut@enterprisedb.com, daniel@yesql.se
Subject: Re: pgsql: psql: Add test for query canceling
In-Reply-To: <alpine.DEB.2.22.394.2108250705270.2232211@pseudo>
References: <E1mH14Q-0002gh-HS@gemulon.postgresql.org> <DD279DFC-DD59-458E-B469-75DC941765A4@yesql.se> <alpine.DEB.2.22.394.2108201736060.498998@pseudo> <5F16EBAA-30D3-4C0D-840C-C2FF2739E370@yesql.se> <1957503.1629485278@sss.pgh.pa.us> <9f46b102-da4d-8312-54f0-1f3bc10b453c@enterprisedb.com> <350197.1629824350@sss.pgh.pa.us> <alpine.DEB.2.22.394.2108250705270.2232211@pseudo>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox