mirror of
http://git.haproxy.org/git/haproxy.git/
synced 2024-12-21 03:00:35 +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.
77 lines
2.1 KiB
Plaintext
77 lines
2.1 KiB
Plaintext
# commit 7b6cc52784526c32efda44b873a4258d3ae0b8c7
|
|
# BUG/MINOR: lua: Bad HTTP client request duration.
|
|
#
|
|
# HTTP LUA applet callback should not update the date on which the HTTP client requests
|
|
# arrive. This was done just after the LUA applet has completed its job.
|
|
#
|
|
# This patch simply removes the affected statement. The same fix has been applied
|
|
# to TCP LUA applet callback.
|
|
#
|
|
# To reproduce this issue, as reported by Patrick Hemmer, implement an HTTP LUA applet
|
|
# which sleeps a bit before replying:
|
|
#
|
|
# core.register_service("foo", "http", function(applet)
|
|
# core.msleep(100)
|
|
# applet:set_status(200)
|
|
# applet:start_response()
|
|
# end)
|
|
#
|
|
# This had as a consequence to log %TR field with approximately the same value as
|
|
# the LUA sleep time.
|
|
|
|
varnishtest "LUA bug"
|
|
#REQUIRE_OPTIONS=LUA
|
|
#REGTEST_TYPE=bug
|
|
|
|
feature ignore_unknown_macro
|
|
|
|
syslog Slog {
|
|
recv info
|
|
expect ~ "[^:\\[ ]\\[[0-9]*\\]: Ta=[0-9]* Tc=[0-9]* Td=[0-9]* Th=[0-9]* Ti=[0-9]* Tq=[0-9]* TR=[0-9]* Tr=[0-9]* Tt=[0-9]* Tw=[0-9]*$"
|
|
|
|
recv info
|
|
expect ~ "[^:\\[ ]\\[[0-9]*\\]: Tc=[0-9]* Td=[0-9]* Th=[0-9]* Tt=[0-9]* Tw=[0-9]*$"
|
|
} -start
|
|
|
|
haproxy h1 -conf {
|
|
global
|
|
lua-load ${testdir}/bad_http_clt_req_duration.lua
|
|
|
|
defaults
|
|
timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
|
|
timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
|
|
timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
|
|
|
|
frontend f1
|
|
mode http
|
|
bind "fd@${f1}"
|
|
log ${Slog_addr}:${Slog_port} daemon
|
|
log-format Ta=%Ta\ Tc=%Tc\ Td=%Td\ Th=%Th\ Ti=%Ti\ Tq=%Tq\ TR=%TR\ Tr=%Tr\ Tt=%Tt\ Tw=%Tw
|
|
default_backend b1
|
|
|
|
backend b1
|
|
mode http
|
|
http-request use-service lua.foo.http
|
|
|
|
frontend f2
|
|
mode tcp
|
|
bind "fd@${f2}"
|
|
log ${Slog_addr}:${Slog_port} daemon
|
|
log-format Tc=%Tc\ Td=%Td\ Th=%Th\ Tt=%Tt\ Tw=%Tw
|
|
|
|
tcp-request inspect-delay 1s
|
|
tcp-request content use-service lua.foo.tcp
|
|
} -start
|
|
|
|
client c1 -connect "${h1_f1_sock}" {
|
|
txreq
|
|
rxresp
|
|
} -run
|
|
|
|
client c2 -connect "${h1_f2_sock}" {
|
|
txreq
|
|
rxresp
|
|
} -run
|
|
|
|
syslog Slog -wait
|