REGTESTS: http_request_buffer: Add a barrier to not mix up log messages
Depending on the timing, time to time, the log messages can be mixed. A
client can start and be fully handled by HAProxy (including its log message)
before the log message of the previous client was emitted or received. To
fix the issue, a barrier was added to be sure to eval the "expect" rule on
logs before starting the next client.
This patch should fix the issue #1847. It may be backported to all branches
containing this reg-tests.
(cherry picked from commit 05ed05b84a4898122568df48bebfd59746ebe2a2)
Signed-off-by: Willy Tarreau <w@1wt.eu>
(cherry picked from commit 3ed3f1cdf5b55e3f9b5acd1e9490c921ba038565)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 2d11c5dd2e36649719e7916d37222d63d4fd9473)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
diff --git a/reg-tests/http-messaging/http_request_buffer.vtc b/reg-tests/http-messaging/http_request_buffer.vtc
index f1cec1a..3c47599 100644
--- a/reg-tests/http-messaging/http_request_buffer.vtc
+++ b/reg-tests/http-messaging/http_request_buffer.vtc
@@ -9,6 +9,8 @@
# thanks to "http-buffer-request". If this was the case, c2 client
# could not connect to s1 server and this would lead to make this test fail.
+barrier b1 cond 2 -cyclic
+
server s1 {
rxreq
expect req.bodylen == 257
@@ -24,10 +26,16 @@
syslog S -level info {
recv
expect ~ "[^:\\[ ]*\\[[0-9]*\\]: .* .* fe1 fe1/<NOSRV> .* 408 .* - - cD-- .* .* \"GET /this-is-a-long-url-this-is-a-long-url-this-is-a-long-url-this-is-a-long-url-this-is-a-long-url-this-is-a-long-url-this-is-a-long-url HTTP/1\\.1\""
+ barrier b1 sync
+
recv
expect ~ "[^:\\[ ]*\\[[0-9]*\\]: .* .* fe1 be1/srv1 [0-9]*/[0-9]*/[0-9]*/[0-9]*/[0-9]* 200 .* - - ---- .* .* \"GET / HTTP/1\\.1\""
+ barrier b1 sync
+
recv
expect ~ "[^:\\[ ]*\\[[0-9]*\\]: .* .* fe2 be1/srv1 [0-9]*/[0-9]*/[0-9]*/[0-9]*/[0-9]* 200 .* - - ---- .* .* \"POST /1 HTTP/1\\.1\""
+ barrier b1 sync
+
recv
expect ~ "[^:\\[ ]*\\[[0-9]*\\]: .* .* fe2 be1/<NOSRV> [0-9]*/-1/-1/-1/[0-9]* -1 .* - - CR-- .* .* \"POST /2 HTTP/1\\.1\""
} -start
@@ -88,6 +96,9 @@
expect resp.status == 408
} -run
+# Wait matching on log message
+barrier b1 sync
+
# Payload is fully sent
# ==> Request must be sent to the server. A 200 must be received
client c2 -connect ${h1_fe1_sock} {
@@ -96,6 +107,9 @@
expect resp.status == 200
} -run
+# Wait matching on log message
+barrier b1 sync
+
# Payload is fully sent in 2 steps (with a small delay, smaller than the client
# timeout) and splitted on a chunk size.
# ==> Request must be sent to the server. A 200 must be received
@@ -107,6 +121,9 @@
expect resp.status == 200
} -run
+# Wait matching on log message
+barrier b1 sync
+
# Last CRLF of the request payload is missing but payload is sent in 2 steps
# (with a small delay, smaller than the client timeout) and splitted on a chunk
# size. The client aborts before sending the last CRLF.