REGTESTS: filters: Exercise per-thread Lua instance state

Load the HTTP probes separately on each thread and inherit frontend
instances into listeners pinned to different threads. Check the Lua
state id and per-state construction counters through frontend and backend
callbacks, including a second stream on each thread.

Verify that instances, disabled instances and independent response
sequences are handled correctly without sharing mutable Lua state between
threads. Extend the probe headers with the Lua state id.

diff --git a/reg-tests/filters/lua-per-thread.vtc b/reg-tests/filters/lua-per-thread.vtc
new file mode 100644 (file)
index 0000000..0404e37
--- /dev/null
+++ b/reg-tests/filters/lua-per-thread.vtc
@@ -0,0 +1,111 @@
+varnishtest "Per-thread Lua filter state is isolated across inherited instances"
+
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(LUA) && feature(THREAD)'"
+feature ignore_unknown_macro
+
+server s1 {
+    rxreq
+    expect req.http.x-probe-threads == "F.a:1;F.b:1;B.a:1;B.c:1;"
+    expect req.http.x-probe-instances == "F.a:2;F.b:1;B.a:1;B.c:2;"
+    expect req.http.x-probe-errors == <undef>
+    txresp -body "thread one"
+    close
+    accept
+
+    rxreq
+    expect req.http.x-probe-threads == "F.a:2;F.b:2;B.a:2;B.c:2;"
+    expect req.http.x-probe-instances == "F.a:2;F.b:1;B.a:1;B.c:2;"
+    expect req.http.x-probe-errors == <undef>
+    txresp -body "thread two"
+    close
+    accept
+
+    rxreq
+    expect req.http.x-probe-threads == "F.a:1;F.b:1;B.a:1;B.c:1;"
+    expect req.http.x-probe-instances == "F.a:4;F.b:3;B.a:3;B.c:4;"
+    expect req.http.x-probe-errors == <undef>
+    txresp -body "thread one again"
+    close
+    accept
+
+    rxreq
+    expect req.http.x-probe-threads == "F.a:2;F.b:2;B.a:2;B.c:2;"
+    expect req.http.x-probe-instances == "F.a:4;F.b:3;B.a:3;B.c:4;"
+    expect req.http.x-probe-errors == <undef>
+    txresp -body "thread two again"
+} -start
+
+haproxy h1 -conf {
+    global
+        nbthread 2
+        thread-groups 1
+        tune.lua.bool-sample-conversion normal
+        lua-load-per-thread "${testdir}/lua-probe.lua"
+    defaults plain
+        mode http
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server "${HAPROXY_TEST_TIMEOUT-5s}"
+
+    defaults frontend_filters from plain
+        filter-config lua id probe-a enabled F a
+        filter-config lua id probe-b enabled F b
+        filter-config lua id probe-d F disabled
+        filter-sequence global lua/probe-b:before(lua/probe-a)
+        filter-sequence response lua/probe-b:before(lua/probe-a)
+
+    frontend one from frontend_filters
+        bind "fd@${one}" thread 1
+        default_backend be
+    frontend two from frontend_filters
+        bind "fd@${two}" thread 2
+        default_backend be
+
+    backend be from plain
+        filter-config lua id probe-a enabled B a
+        filter-config lua id probe-c enabled B c
+        filter-sequence response lua/probe-c:before(lua/probe-a)
+        server s1 ${s1_addr}:${s1_port}
+} -start
+
+client c1 -connect ${h1_one_sock} {
+    txreq
+    rxresp
+    expect resp.status == 200
+    expect resp.http.x-probe-order == "F.b;F.a;B.c;B.a;"
+    expect resp.http.x-probe-threads == "F.b:1;F.a:1;B.c:1;B.a:1;"
+    expect resp.http.x-probe-instances == "F.b:1;F.a:2;B.c:2;B.a:1;"
+    expect resp.http.x-probe-errors == <undef>
+    expect resp.body == "thread one"
+} -run
+
+client c2 -connect ${h1_two_sock} {
+    txreq
+    rxresp
+    expect resp.status == 200
+    expect resp.http.x-probe-order == "F.b;F.a;B.c;B.a;"
+    expect resp.http.x-probe-threads == "F.b:2;F.a:2;B.c:2;B.a:2;"
+    expect resp.http.x-probe-instances == "F.b:1;F.a:2;B.c:2;B.a:1;"
+    expect resp.http.x-probe-errors == <undef>
+    expect resp.body == "thread two"
+} -run
+
+client c3 -connect ${h1_one_sock} {
+    txreq
+    rxresp
+    expect resp.status == 200
+    expect resp.http.x-probe-threads == "F.b:1;F.a:1;B.c:1;B.a:1;"
+    expect resp.http.x-probe-instances == "F.b:3;F.a:4;B.c:4;B.a:3;"
+    expect resp.http.x-probe-errors == <undef>
+    expect resp.body == "thread one again"
+} -run
+
+client c4 -connect ${h1_two_sock} {
+    txreq
+    rxresp
+    expect resp.status == 200
+    expect resp.http.x-probe-threads == "F.b:2;F.a:2;B.c:2;B.a:2;"
+    expect resp.http.x-probe-instances == "F.b:3;F.a:4;B.c:4;B.a:3;"
+    expect resp.http.x-probe-errors == <undef>
+    expect resp.body == "thread two again"
+} -run

diff --git a/reg-tests/filters/lua-probe.lua b/reg-tests/filters/lua-probe.lua
index d5020758765e2192e2587d294d54123374d412a1..846457c1f53703da733a1063a3db85552ff13375 100644 (file)
--- a/reg-tests/filters/lua-probe.lua
+++ b/reg-tests/filters/lua-probe.lua
@@ -62,6 +62,7 @@ local function register(name)
         self.headers_seen[side] = true
         append(msg, "x-probe-order", tag)
         append(msg, "x-probe-instances", tag .. ":" .. self.serial)
+        append(msg, "x-probe-threads", tag .. ":" .. core.thread)
         local encoding = msg:get_headers()["content-encoding"]
         append(msg, "x-probe-encodings", tag .. ":" .. (encoding and encoding[0] or "identity"))
         if side == 2 and (self.mode == "data" or self.limit > 0) then