BBlack has submitted this change and it was merged.
Change subject: varnish: remove hash_ignore_busy on pass
......................................................................
varnish: remove hash_ignore_busy on pass
req.hash_ignore_busy is redundant/pointless when doing an explicit
"return (pass)", as pass uses an anonymous unique per-request
object.
Change-Id: I290734e9825c1b75bfccd431d667625f7fdcaa11
---
M templates/varnish/mobile-backend.inc.vcl.erb
M templates/varnish/mobile-frontend.inc.vcl.erb
M templates/varnish/text-backend.inc.vcl.erb
M templates/varnish/text-common.inc.vcl.erb
M templates/varnish/text-frontend.inc.vcl.erb
5 files changed, 0 insertions(+), 7 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/varnish/mobile-backend.inc.vcl.erb
b/templates/varnish/mobile-backend.inc.vcl.erb
index d7a9cdd..8c6f62b 100644
--- a/templates/varnish/mobile-backend.inc.vcl.erb
+++ b/templates/varnish/mobile-backend.inc.vcl.erb
@@ -25,7 +25,6 @@
<% else -%>
set req.backend = backend_random;
<% end -%>
- set req.hash_ignore_busy = true;
return (pass);
}
@@ -52,7 +51,6 @@
<% if @site_tier != "one" -%>
set req.backend = backend_random;
<% end -%>
- set req.hash_ignore_busy = true;
return (pass);
}
diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb
b/templates/varnish/mobile-frontend.inc.vcl.erb
index a819cc2..9f8c15f 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -84,7 +84,6 @@
if (req.request != "GET" && req.request != "HEAD") {
set req.backend = backend_random;
- set req.hash_ignore_busy = true;
return (pass);
}
diff --git a/templates/varnish/text-backend.inc.vcl.erb
b/templates/varnish/text-backend.inc.vcl.erb
index 52a8e0e..47bff4e 100644
--- a/templates/varnish/text-backend.inc.vcl.erb
+++ b/templates/varnish/text-backend.inc.vcl.erb
@@ -25,7 +25,6 @@
<% else -%>
set req.backend = backend_random;
<% end -%>
- set req.hash_ignore_busy = true;
return (pass);
}
@@ -52,7 +51,6 @@
<% if @site_tier != "one" -%>
set req.backend = backend_random;
<% end -%>
- set req.hash_ignore_busy = true;
return (pass);
}
diff --git a/templates/varnish/text-common.inc.vcl.erb
b/templates/varnish/text-common.inc.vcl.erb
index 447f002..0f3f35d 100644
--- a/templates/varnish/text-common.inc.vcl.erb
+++ b/templates/varnish/text-common.inc.vcl.erb
@@ -52,7 +52,6 @@
// have OAuth data, with the same header-matching as in:
//
https://phabricator.wikimedia.org/diffusion/EOAU/browse/master/backend/MWOAuthUtils.php;8029ef146211a1016b1f8e676944c3750f78b0eb$89
if (req.http.Authorization ~ "^OAuth ") {
- set req.hash_ignore_busy = true;
return (pass);
}
}
diff --git a/templates/varnish/text-frontend.inc.vcl.erb
b/templates/varnish/text-frontend.inc.vcl.erb
index c80aac1..6fcfe5c 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -92,7 +92,6 @@
if (req.request != "GET" && req.request != "HEAD") {
set req.backend = backend_random;
- set req.hash_ignore_busy = true;
return (pass);
}
--
To view, visit https://gerrit.wikimedia.org/r/257591
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I290734e9825c1b75bfccd431d667625f7fdcaa11
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
