Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit98a9b37

Browse files
author
Amit Kapila
committed
Revert commits290acac and8a7e9e9.
This commit revert the commits to add a test case that tests the 'force'option when there is an active backend connected to the database beingdropped.This feature internally sends SIGTERM to all the backends connected to thedatabase being dropped and then the same is reported to the client. Wefound that on Windows, the client end of the socket is not able to readthe data once we close the socket in the server which leads to loss oferror message which is not what we expect. We also observed similarbehavior in other cases like pg_terminate_backend(),pg_ctl kill TERM <pid>. There are probably a few others like that. Thefix for this requires further study.Discussion:https://postgr.es/m/E1iaD8h-0004us-K9@gemulon.postgresql.org
1 parente6c2d17 commit98a9b37

File tree

4 files changed

+47
-165
lines changed

4 files changed

+47
-165
lines changed

‎src/bin/scripts/t/050_dropdb.pl

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
use PostgresNode;
55
use TestLib;
6-
use Test::Moretests=>11;
6+
use Test::Moretests=>13;
77

88
program_help_ok('dropdb');
99
program_version_ok('dropdb');
@@ -19,5 +19,11 @@
1919
qr/statement: DROP DATABASE foobar1/,
2020
'SQL DROP DATABASE run');
2121

22+
$node->safe_psql('postgres','CREATE DATABASE foobar2');
23+
$node->issues_sql_like(
24+
['dropdb','--force','foobar2' ],
25+
qr/statement: DROP DATABASE foobar2 WITH\(FORCE\);/,
26+
'SQL DROP DATABASE (FORCE) run');
27+
2228
$node->command_fails(['dropdb','nonexistent' ],
2329
'fails with nonexistent database');

‎src/bin/scripts/t/051_dropdb_force.pl

Lines changed: 0 additions & 104 deletions
This file was deleted.

‎src/test/perl/TestLib.pm

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -860,43 +860,6 @@ sub command_checks_all
860860

861861
=pod
862862
863-
=itempump_until(proc, timeout, stream, untl)
864-
865-
# Pump until string is matched, or timeout occurs
866-
867-
=cut
868-
869-
subpump_until
870-
{
871-
my ($proc,$timeout,$stream,$untl) =@_;
872-
$proc->pump_nb();
873-
while (1)
874-
{
875-
lastif$$stream =~/$untl/;
876-
if ($timeout->is_expired)
877-
{
878-
diag("aborting wait: program timed out");
879-
diag("stream contents: >>",$$stream,"<<");
880-
diag("pattern searched for:",$untl);
881-
882-
return 0;
883-
}
884-
if (not$proc->pumpable())
885-
{
886-
diag("aborting wait: program died");
887-
diag("stream contents: >>",$$stream,"<<");
888-
diag("pattern searched for:",$untl);
889-
890-
return 0;
891-
}
892-
$proc->pump();
893-
}
894-
return 1;
895-
896-
}
897-
898-
=pod
899-
900863
=back
901864
902865
=cut

‎src/test/recovery/t/013_crash_restart.pl

Lines changed: 40 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,7 @@
7272
INSERT INTO alive VALUES($$committed-before-sigquit$$);
7373
SELECT pg_backend_pid();
7474
];
75-
ok(TestLib::pump_until(
76-
$killme,$psql_timeout, \$killme_stdout,
77-
qr/[[:digit:]]+[\r\n]$/m),
75+
ok(pump_until($killme, \$killme_stdout,qr/[[:digit:]]+[\r\n]$/m),
7876
'acquired pid for SIGQUIT');
7977
my$pid =$killme_stdout;
8078
chomp($pid);
@@ -86,9 +84,7 @@
8684
BEGIN;
8785
INSERT INTO alive VALUES($$in-progress-before-sigquit$$) RETURNING status;
8886
];
89-
ok(TestLib::pump_until(
90-
$killme,$psql_timeout, \$killme_stdout,
91-
qr/in-progress-before-sigquit/m),
87+
ok(pump_until($killme, \$killme_stdout,qr/in-progress-before-sigquit/m),
9288
'inserted in-progress-before-sigquit');
9389
$killme_stdout ='';
9490
$killme_stderr ='';
@@ -101,8 +97,7 @@
10197
SELECT $$psql-connected$$;
10298
SELECT pg_sleep(3600);
10399
];
104-
ok(TestLib::pump_until(
105-
$monitor,$psql_timeout, \$monitor_stdout,qr/psql-connected/m),
100+
ok(pump_until($monitor, \$monitor_stdout,qr/psql-connected/m),
106101
'monitor connected');
107102
$monitor_stdout ='';
108103
$monitor_stderr ='';
@@ -117,9 +112,8 @@
117112
$killme_stdin .=q[
118113
SELECT 1;
119114
];
120-
ok(TestLib::pump_until(
115+
ok( pump_until(
121116
$killme,
122-
$psql_timeout,
123117
\$killme_stderr,
124118
qr/WARNING: terminating connection because of crash of another server process|server closed the connection unexpectedly|connection to server was lost/m
125119
),
@@ -131,9 +125,8 @@
131125
# Wait till server restarts - we should get the WARNING here, but
132126
# sometimes the server is unable to send that, if interrupted while
133127
# sending.
134-
ok(TestLib::pump_until(
128+
ok( pump_until(
135129
$monitor,
136-
$psql_timeout,
137130
\$monitor_stderr,
138131
qr/WARNING: terminating connection because of crash of another server process|server closed the connection unexpectedly|connection to server was lost/m
139132
),
@@ -160,8 +153,7 @@
160153
$killme_stdin .=q[
161154
SELECT pg_backend_pid();
162155
];
163-
ok(TestLib::pump_until(
164-
$killme,$psql_timeout, \$killme_stdout,qr/[[:digit:]]+[\r\n]$/m),
156+
ok(pump_until($killme, \$killme_stdout,qr/[[:digit:]]+[\r\n]$/m),
165157
"acquired pid for SIGKILL");
166158
$pid =$killme_stdout;
167159
chomp($pid);
@@ -174,9 +166,7 @@
174166
BEGIN;
175167
INSERT INTO alive VALUES($$in-progress-before-sigkill$$) RETURNING status;
176168
];
177-
ok(TestLib::pump_until(
178-
$killme,$psql_timeout, \$killme_stdout,
179-
qr/in-progress-before-sigkill/m),
169+
ok(pump_until($killme, \$killme_stdout,qr/in-progress-before-sigkill/m),
180170
'inserted in-progress-before-sigkill');
181171
$killme_stdout ='';
182172
$killme_stderr ='';
@@ -188,8 +178,7 @@
188178
SELECT $$psql-connected$$;
189179
SELECT pg_sleep(3600);
190180
];
191-
ok(TestLib::pump_until(
192-
$monitor,$psql_timeout, \$monitor_stdout,qr/psql-connected/m),
181+
ok(pump_until($monitor, \$monitor_stdout,qr/psql-connected/m),
193182
'monitor connected');
194183
$monitor_stdout ='';
195184
$monitor_stderr ='';
@@ -205,9 +194,8 @@
205194
$killme_stdin .=q[
206195
SELECT 1;
207196
];
208-
ok(TestLib::pump_until(
197+
ok( pump_until(
209198
$killme,
210-
$psql_timeout,
211199
\$killme_stderr,
212200
qr/server closed the connection unexpectedly|connection to server was lost/m
213201
),
@@ -217,9 +205,8 @@
217205
# Wait till server restarts - we should get the WARNING here, but
218206
# sometimes the server is unable to send that, if interrupted while
219207
# sending.
220-
ok(TestLib::pump_until(
208+
ok( pump_until(
221209
$monitor,
222-
$psql_timeout,
223210
\$monitor_stderr,
224211
qr/WARNING: terminating connection because of crash of another server process|server closed the connection unexpectedly|connection to server was lost/m
225212
),
@@ -257,3 +244,33 @@
257244
'can still write after orderly restart');
258245

259246
$node->stop();
247+
248+
# Pump until string is matched, or timeout occurs
249+
subpump_until
250+
{
251+
my ($proc,$stream,$untl) =@_;
252+
$proc->pump_nb();
253+
while (1)
254+
{
255+
lastif$$stream =~/$untl/;
256+
if ($psql_timeout->is_expired)
257+
{
258+
diag("aborting wait: program timed out");
259+
diag("stream contents: >>",$$stream,"<<");
260+
diag("pattern searched for:",$untl);
261+
262+
return 0;
263+
}
264+
if (not$proc->pumpable())
265+
{
266+
diag("aborting wait: program died");
267+
diag("stream contents: >>",$$stream,"<<");
268+
diag("pattern searched for:",$untl);
269+
270+
return 0;
271+
}
272+
$proc->pump();
273+
}
274+
return 1;
275+
276+
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp