rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reorder connection markers in loadbalance tests 

Commit 7f5b198 introduced TAP tests that use string literals to mark
the presence of a query in server logs.  Reorder the markers to make
sure they are used in alphabetical order for easier debugging.

Author: Gurjeet Singh <gurjeet@singh.im>
Reviewed-by: Jelte Fennema <postgres@jeltef.nl>
Discussion: https://postgr.es/m/CABwTF4WcYAENqyUQS2crAYfDuJ497v82ty2-MirjaC+zz9e8nQ@mail.gmail.com
This commit is contained in:
Daniel Gustafsson 2023-04-21 12:29:38 +02:00
parent 60ce452729
commit a23ab2eebf
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/interfaces/libpq/t/003_load_balance_host_list.pl
View File

@ -36,8 +36,8 @@ $node1->connect_fails(
# load_balance_hosts=disable should always choose the first one.
$node1->connect_ok("host=$hostlist port=$portlist load_balance_hosts=disable",
"load_balance_hosts=disable connects to the first node",
sql => "SELECT 'connect2'",
log_like => [qr/statement: SELECT 'connect2'/]);
sql => "SELECT 'connect1'",
log_like => [qr/statement: SELECT 'connect1'/]);
# Statistically the following loop with load_balance_hosts=random will almost
# certainly connect at least once to each of the nodes. The chance of that not
@ -45,12 +45,12 @@ $node1->connect_ok("host=$hostlist port=$portlist load_balance_hosts=disable",
foreach my $i (1 .. 50) {
$node1->connect_ok("host=$hostlist port=$portlist load_balance_hosts=random",
"repeated connections with random load balancing",
sql => "SELECT 'connect1'");
sql => "SELECT 'connect2'");
}
my $node1_occurences = () = $node1->log_content() =~ /statement: SELECT 'connect1'/g;
my $node2_occurences = () = $node2->log_content() =~ /statement: SELECT 'connect1'/g;
my $node3_occurences = () = $node3->log_content() =~ /statement: SELECT 'connect1'/g;
my $node1_occurences = () = $node1->log_content() =~ /statement: SELECT 'connect2'/g;
my $node2_occurences = () = $node2->log_content() =~ /statement: SELECT 'connect2'/g;
my $node3_occurences = () = $node3->log_content() =~ /statement: SELECT 'connect2'/g;
my $total_occurences = $node1_occurences + $node2_occurences + $node3_occurences;

12
src/interfaces/libpq/t/004_load_balance_dns.pl
View File

@ -78,8 +78,8 @@ $node3->start();
# load_balance_hosts=disable should always choose the first one.
$node1->connect_ok("host=pg-loadbalancetest port=$port load_balance_hosts=disable",
"load_balance_hosts=disable connects to the first node",
sql => "SELECT 'connect2'",
log_like => [qr/statement: SELECT 'connect2'/]);
sql => "SELECT 'connect1'",
log_like => [qr/statement: SELECT 'connect1'/]);
# Statistically the following loop with load_balance_hosts=random will almost
@ -88,12 +88,12 @@ $node1->connect_ok("host=pg-loadbalancetest port=$port load_balance_hosts=disabl
foreach my $i (1 .. 50) {
$node1->connect_ok("host=pg-loadbalancetest port=$port load_balance_hosts=random",
"repeated connections with random load balancing",
sql => "SELECT 'connect1'");
sql => "SELECT 'connect2'");
}
my $node1_occurences = () = $node1->log_content() =~ /statement: SELECT 'connect1'/g;
my $node2_occurences = () = $node2->log_content() =~ /statement: SELECT 'connect1'/g;
my $node3_occurences = () = $node3->log_content() =~ /statement: SELECT 'connect1'/g;
my $node1_occurences = () = $node1->log_content() =~ /statement: SELECT 'connect2'/g;
my $node2_occurences = () = $node2->log_content() =~ /statement: SELECT 'connect2'/g;
my $node3_occurences = () = $node3->log_content() =~ /statement: SELECT 'connect2'/g;
my $total_occurences = $node1_occurences + $node2_occurences + $node3_occurences;