mirror of
http://git.haproxy.org/git/haproxy.git/
synced 2024-12-19 10:14:41 +00:00
f673923629
With the CI occasionally slowing down, we're starting to see again some spurious failures despite the long 1-second timeouts. This reports false positives that are disturbing and doesn't provide as much value as this could. However at this delay it already becomes a pain for developers to wait for the tests to complete. This commit adds support for the new environment variable HAPROXY_TEST_TIMEOUT that will allow anyone to modify the connect, client and server timeouts. It was set to 5 seconds by default, which should be plenty for quite some time in the CI. All relevant values that were 200ms or above were replaced by this one. A few larger values were left as they are special. One test for the set-timeout action that used to rely on a fixed 1-sec value was extended to a fixed 5-sec, as the timeout is normally not reached, but it needs to be known to compare the old and new values.
63 lines
2.0 KiB
Plaintext
63 lines
2.0 KiB
Plaintext
# commit d02286d
|
|
# BUG/MINOR: log: pin the front connection when front ip/ports are logged
|
|
#
|
|
# Mathias Weiersmueller reported an interesting issue with logs which Lukas
|
|
# diagnosed as dating back from commit 9b061e332 (1.5-dev9). When front
|
|
# connection information (ip, port) are logged in TCP mode and the log is
|
|
# emitted at the end of the connection (eg: because %B or any log tag
|
|
# requiring LW_BYTES is set), the log is emitted after the connection is
|
|
# closed, so the address and ports cannot be retrieved anymore.
|
|
#
|
|
# It could be argued that we'd make a special case of these to immediately
|
|
# retrieve the source and destination addresses from the connection, but it
|
|
# seems cleaner to simply pin the front connection, marking it "tracked" by
|
|
# adding the LW_XPRT flag to mention that we'll need some of these elements
|
|
# at the last moment. Only LW_FRTIP and LW_CLIP are affected. Note that after
|
|
# this change, LW_FRTIP could simply be removed as it's not used anywhere.
|
|
#
|
|
# Note that the problem doesn't happen when using %[src] or %[dst] since
|
|
# all sample expressions set LW_XPRT.
|
|
|
|
#REGTEST_TYPE=bug
|
|
|
|
varnishtest "Wrong ip/port logging"
|
|
feature ignore_unknown_macro
|
|
|
|
server s1 {
|
|
rxreq
|
|
delay 0.02
|
|
} -start
|
|
|
|
syslog Slg_1 -level notice {
|
|
recv info
|
|
expect ~ \"dip\":\"${h1_fe_1_addr}\",\"dport\":\"${h1_fe_1_port}.*\"ts\":\"[cC]D\",\"
|
|
} -start
|
|
|
|
haproxy h1 -conf {
|
|
global
|
|
log ${Slg_1_addr}:${Slg_1_port} local0
|
|
|
|
defaults
|
|
log global
|
|
timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
|
|
timeout client 1
|
|
timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
|
|
|
|
frontend fe1
|
|
bind "fd@${fe_1}"
|
|
mode tcp
|
|
log-format {\"dip\":\"%fi\",\"dport\":\"%fp\",\"c_ip\":\"%ci\",\"c_port\":\"%cp\",\"fe_name\":\"%ft\",\"be_name\":\"%b\",\"s_name\":\"%s\",\"ts\":\"%ts\",\"bytes_read\":\"%B\"}
|
|
default_backend be_app
|
|
|
|
backend be_app
|
|
server app1 ${s1_addr}:${s1_port}
|
|
} -start
|
|
|
|
client c1 -connect ${h1_fe_1_sock} {
|
|
txreq -url "/"
|
|
expect_close
|
|
} -run
|
|
|
|
syslog Slg_1 -wait
|
|
|