Skip to content

Commit 5cbaa00

Browse files
committed
Make postmaster 003_start_stop.pl test less flaky
The test is very sensitive to how backends start and exit, because it tests dead-end backends which occur when all the connection slots are in use. The test failed occasionally in the CI, when the backend that was launched for the raw_connect_works() check lingered for a while, and exited only later during the test. When it exited, it released a connection slot, when the test expected all the slots to be in use at that time. The 002_connection_limits.pl test had a similar issue: if the backend launched for safe_psql() in the test initialization lingers around, it uses up a connection slot during the test, messing up the test's connection counting. I haven't seen that in the CI, but when I added a "sleep(1);" to proc_exit(), the test failed. To make the tests more robust, restart the server to ensure that the lingering backends doesn't interfere with the later test steps. In the passing, fix a bogus test name. Report and analysis by Jelte Fennema-Nio, Andres Freund, Thomas Munro. Discussion: https://www.postgresql.org/message-id/CAGECzQSU2iGuocuP+fmu89hmBmR3tb-TNyYKjCcL2M_zTCkAFw@mail.gmail.com Backpatch-through: 18
1 parent 85ddcc2 commit 5cbaa00

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

src/test/postmaster/t/002_connection_limits.pl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@ sub connect_fails_wait
7474
ok(1, "$test_name: client backend process exited");
7575
}
7676

77+
# Restart the server to ensure that any backends launched for the
78+
# initialization steps are gone. Otherwise they could still be using
79+
# up connection slots and mess with our expectations.
80+
$node->restart;
81+
7782
my @sessions = ();
7883
my @raw_connections = ();
7984

src/test/postmaster/t/003_start_stop.pl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@
4646
plan skip_all => "this test requires working raw_connect()";
4747
}
4848

49+
# Restart the server to ensure that the backend launched for
50+
# raw_connect_works() is gone. Otherwise, it might free up the
51+
# connection slot later, when we expect all the slots to be in use.
52+
$node->restart;
53+
4954
my @raw_connections = ();
5055

5156
# Open a lot of TCP (or Unix domain socket) connections to use up all
@@ -81,7 +86,7 @@
8186
# clients already" instead of "role does not exist" error. Test that
8287
# to ensure that we have used up all the slots.
8388
$node->connect_fails("dbname=postgres user=invalid_user",
84-
"connect ",
89+
"connection is rejected when all slots are in use",
8590
expected_stderr => qr/FATAL: sorry, too many clients already/);
8691

8792
# Open one more connection, to really ensure that we have at least one

0 commit comments

Comments
 (0)