mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 15:17:01 +02:00
Code Issues Projects Releases Wiki Activity

REGTEST: make the IP+port logging test more reliable

Browse Source 
On my machine, test log/b00000.vtc fails ~9/10 times. Apparently, the
connection is often marked as reset before the timeout strikes, so the
log shows "CD" flags instead of "cD". This fix does two things :
  1) shorten the client timeout to 1 millisecond instead of 5
  2) accept both "cD" and "CD" as valid termination states since the
     purpose is to validate the source address and port, and not the
     status itself.
This commit is contained in:
Willy Tarreau 2018-10-28 19:19:48 +01:00
parent e7a770ce80
commit f95838ca2d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
reg-tests/log/b00000.vtc
View File

@ -30,7 +30,7 @@ syslog Slg_1 -level notice {
recv recv
recv recv
recv info recv info
expect ~ \"dip\":\"${h1_fe_1_addr}\",\"dport\":\"${h1_fe_1_port}.*\"ts\":\"cD\",\" expect ~ \"dip\":\"${h1_fe_1_addr}\",\"dport\":\"${h1_fe_1_port}.*\"ts\":\"[cC]D\",\"
} -start } -start
haproxy h1 -conf { haproxy h1 -conf {
@ -40,7 +40,7 @@ haproxy h1 -conf {
defaults defaults
log global log global
timeout connect 3000 timeout connect 3000
timeout client 5 timeout client 1
timeout server 10000 timeout server 10000
frontend fe1 frontend fe1