]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
REGTESTS: reorder reuse conn proxy protocol test
authorAmaury Denoyelle <adenoyelle@haproxy.com>
Thu, 18 Feb 2021 15:03:37 +0000 (16:03 +0100)
committerAmaury Denoyelle <adenoyelle@haproxy.com>
Thu, 18 Feb 2021 15:07:17 +0000 (16:07 +0100)
Try to fix http_reuse_conn_hash proxy protocol for both single and
multi-thread environment. Schedule a new set of requests to be sure that
takeover will be functional even with pool-low-count set to 2.

reg-tests/connection/http_reuse_conn_hash.vtc

index f6c8765e1d6dc39d222f87fa34d83124d349b39c..991e86f7a8e411599d9a222ae831fa362a02ff7a 100644 (file)
@@ -123,7 +123,17 @@ client c_proxy -connect ${h1_feS_proxy_sock} -proxy1 "127.0.0.1:40000 ${h1_feS_p
        expect resp.http.http_first_request == "0"
 } -run
 
-## second request with same proxy protocol entry
+## second request with different proxy protocol
+# this have the nice effect to fill the server pool to 2 connection
+# (pool-low-conn value) to allow takeover on multi thread run
+client c_proxy -connect ${h1_feS_proxy_sock} -proxy1 "127.0.0.1:50000 ${h1_feS_proxy_addr}:${h1_feS_proxy_port}" {
+       txreq
+       rxresp
+       expect resp.status == 200
+       expect resp.http.http_first_request == "1"
+} -run
+
+## third request, reuse same proxy protocol entry
 client c_proxy -connect ${h1_feS_proxy_sock} -proxy1 "127.0.0.1:40000 ${h1_feS_proxy_addr}:${h1_feS_proxy_port}" {
        txreq
        rxresp
@@ -131,15 +141,15 @@ client c_proxy -connect ${h1_feS_proxy_sock} -proxy1 "127.0.0.1:40000 ${h1_feS_p
        expect resp.http.http_first_request == "0"
 } -run
 
-## third request with different proxy protocol entry, no reuse
-client c_proxy -connect ${h1_feS_proxy_sock} -proxy1 "127.0.0.1:50000 ${h1_feS_proxy_addr}:${h1_feS_proxy_port}" {
+## fourth request with different proxy protocol entry, no reuse
+client c_proxy -connect ${h1_feS_proxy_sock} -proxy1 "127.0.0.1:60000 ${h1_feS_proxy_addr}:${h1_feS_proxy_port}" {
        txreq
        rxresp
        expect resp.status == 200
        expect resp.http.http_first_request == "1"
 } -run
 
-## fourth request, reuse proxy protocol
+## fifth request, reuse proxy protocol
 client c_proxy -connect ${h1_feS_proxy_sock} -proxy1 "127.0.0.1:50000 ${h1_feS_proxy_addr}:${h1_feS_proxy_port}" {
        txreq
        rxresp