Mailing List Archive

[master] a5fb7797a Deprecate BackendReuse in favor of BackendClose
commit a5fb7797a3f9739554018d63d47076bebfb54007
Author: Reza Naghibi <reza@naghibi.com>
Date: Wed Jun 10 08:35:42 2020 -0400

Deprecate BackendReuse in favor of BackendClose

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index 5c1f5b58d..fb289c7a1 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -242,7 +242,7 @@ vbe_dir_finish(VRT_CTX, VCL_BACKEND d)
Lck_Lock(&bp->mtx);
} else {
assert (PFD_State(pfd) == PFD_STATE_USED);
- VSLb(bo->vsl, SLT_BackendReuse, "%d %s", *PFD_Fd(pfd),
+ VSLb(bo->vsl, SLT_BackendClose, "%d %s", *PFD_Fd(pfd),
VRT_BACKEND_string(bp->director));
Lck_Lock(&bp->mtx);
VSC_C_main->backend_recycle++;
diff --git a/bin/varnishtest/tests/e00008.vtc b/bin/varnishtest/tests/e00008.vtc
index fce13457d..4c516e003 100644
--- a/bin/varnishtest/tests/e00008.vtc
+++ b/bin/varnishtest/tests/e00008.vtc
@@ -83,19 +83,19 @@ logexpect l1 -v v1 -g vxid {
expect 0 = ESI_xmlerror {^ERR after 665 ESI 1.0 </esi:include> illegal end-tag$}
expect 0 = ESI_xmlerror {^ERR after 767 XML 1.0 Missing end attribute delimiter$}
expect 0 = ESI_xmlerror {^ERR after 843 ESI 1.0 <esi:include> has whitespace in src= attribute$}
- expect 0 = BackendReuse
+ expect 0 = BackendClose
} -start

logexpect l2 -v v1 -g vxid {
expect * * BereqURL {^/body$}
expect * = ESI_xmlerror {^ERR after 30 VEP ended inside a tag$}
- expect 0 = BackendReuse
+ expect 0 = BackendClose
} -start

logexpect l3 -v v1 -g vxid {
expect * * BereqURL {^/body2$}
expect * = ESI_xmlerror {^ERR after 39 VEP ended inside a tag$}
- expect 0 = BackendReuse
+ expect 0 = BackendClose
} -start

varnish v1 -cliok "param.set debug +esi_chop"
diff --git a/bin/varnishtest/tests/e00019.vtc b/bin/varnishtest/tests/e00019.vtc
index 4c69bd19f..98ed56f3e 100644
--- a/bin/varnishtest/tests/e00019.vtc
+++ b/bin/varnishtest/tests/e00019.vtc
@@ -63,7 +63,7 @@ logexpect l1 -v v1 -g vxid -q "vxid == 1002" {
expect 0 = ESI_xmlerror {^WARN after 107 ESI 1.0 <esi:include> lacks final '/'$}
expect 0 = ESI_xmlerror {^ERR after 130 ESI 1.0 <esi:bogus> element$}
expect 0 = ESI_xmlerror {^ERR after 131837 VEP ended inside a tag$}
- expect 0 = BackendReuse
+ expect 0 = BackendClose
} -start

client c1 {
diff --git a/bin/varnishtest/tests/e00020.vtc b/bin/varnishtest/tests/e00020.vtc
index 7c27efa05..75210778f 100644
--- a/bin/varnishtest/tests/e00020.vtc
+++ b/bin/varnishtest/tests/e00020.vtc
@@ -27,7 +27,7 @@ logexpect l1 -v v1 -g vxid {
expect 0 = ESI_xmlerror {^ERR after 3 ESI 1.0 <esi:include> element nested in <esi:remove>$}
expect 0 = ESI_xmlerror {^ERR after 3 ESI 1.0 Nested <!--esi element in <esi:remove>$}
expect 0 = Gzip {^U}
- expect 0 = BackendReuse
+ expect 0 = BackendClose
} -start

client c1 {
diff --git a/bin/varnishtest/tests/e00022.vtc b/bin/varnishtest/tests/e00022.vtc
index 446d2e2e8..2a99c8acd 100644
--- a/bin/varnishtest/tests/e00022.vtc
+++ b/bin/varnishtest/tests/e00022.vtc
@@ -33,7 +33,7 @@ logexpect l1 -v v1 -g vxid {
expect 0 = ESI_xmlerror {^ERR after 24 ESI 1.0 Nested <!--esi element in <esi:remove>$}
expect 0 = Gzip {^G}
expect 0 = Gzip {^U}
- expect 0 = BackendReuse
+ expect 0 = BackendClose
} -start

client c1 {
diff --git a/bin/varnishtest/tests/r00894.vtc b/bin/varnishtest/tests/r00894.vtc
index 4a815233e..0cb094822 100644
--- a/bin/varnishtest/tests/r00894.vtc
+++ b/bin/varnishtest/tests/r00894.vtc
@@ -14,7 +14,7 @@ varnish v1 -vcl+backend {
logexpect l1 -v v1 -g raw {
expect * * Fetch_Body
expect 0 = ESI_xmlerror {^ERR after 5 ESI 1.0 <esi:include> has multiple src= attributes$}
- expect 0 = BackendReuse
+ expect 0 = BackendClose
} -start

client c1 {
diff --git a/bin/varnishtest/tests/r01092.vtc b/bin/varnishtest/tests/r01092.vtc
index a53b7ba47..468f6a591 100644
--- a/bin/varnishtest/tests/r01092.vtc
+++ b/bin/varnishtest/tests/r01092.vtc
@@ -27,7 +27,7 @@ varnish v1 -vcl+backend {
logexpect l1 -v v1 -g raw {
expect * * Fetch_Body
expect 0 * ESI_xmlerror {^ERR after 66 ESI 1.0 Nested <!--esi element in <esi:remove>$}
- expect 0 = BackendReuse
+ expect 0 = BackendClose
} -start

client c1 {
diff --git a/bin/varnishtest/tests/r01355.vtc b/bin/varnishtest/tests/r01355.vtc
index 44b1b39e9..5385b2a31 100644
--- a/bin/varnishtest/tests/r01355.vtc
+++ b/bin/varnishtest/tests/r01355.vtc
@@ -24,11 +24,11 @@ varnish v1 -vcl+backend {
logexpect l1 -v v1 -g raw {
expect * * Fetch_Body
expect 0 = ESI_xmlerror {^No ESI processing, first char not '<' but BOM. .See feature esi_remove_bom.$}
- expect 0 = BackendReuse
+ expect 0 = BackendClose
# XXX another logexpect weirdness - why can't we catch the second occurrence?
# expect * * Fetch_Body
# expect 0 = ESI_xmlerror {^No ESI processing, first char not '<' but BOM. .See feature esi_remove_bom.$}
-# expect 0 = BackendReuse
+# expect 0 = BackendClose
} -start

client c1 {
diff --git a/include/tbl/vsl_tags.h b/include/tbl/vsl_tags.h
index 31fed3547..bebfa738b 100644
--- a/include/tbl/vsl_tags.h
+++ b/include/tbl/vsl_tags.h
@@ -126,6 +126,7 @@ SLTM(BackendReuse, 0, "Backend connection put up for reuse",
"\t| +- Backend display name\n"
"\t+---- Connection file descriptor\n"
"\n"
+ NOSUP_NOTICE
)

SLTM(BackendClose, 0, "Backend connection closed",
_______________________________________________
varnish-commit mailing list
varnish-commit@varnish-cache.org
https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit