BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/204773
Change subject: normalize on $cluster_tier as numeric
......................................................................
normalize on $cluster_tier as numeric
Change-Id: If323f9cd7ef1c328e4c557bef09d86647c456233
---
M templates/varnish/bits.inc.vcl.erb
M templates/varnish/mobile-backend.inc.vcl.erb
M templates/varnish/text-backend.inc.vcl.erb
M templates/varnish/upload-backend.inc.vcl.erb
M templates/varnish/upload-frontend.inc.vcl.erb
5 files changed, 11 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/73/204773/1
diff --git a/templates/varnish/bits.inc.vcl.erb
b/templates/varnish/bits.inc.vcl.erb
index d1df615..bb95156 100644
--- a/templates/varnish/bits.inc.vcl.erb
+++ b/templates/varnish/bits.inc.vcl.erb
@@ -2,7 +2,7 @@
include "errorpage.inc.vcl";
-<% if @vcl_config.fetch("cluster_tier", "1") == "1" -%>
+<% if @vcl_config.fetch("cluster_tier", 1) == 1 -%>
sub mangle_request {
// Transform backend url: /<sitename>/load.php -> /w/load.php
// Set host header for backend to <sitename>
@@ -42,7 +42,7 @@
}
if (req.http.host == "<%= @cluster_options.fetch("bits_domain",
"bits.wikimedia.org") %>") {
-<% if @vcl_config.fetch("cluster_tier", "1") == "1" -%>
+<% if @vcl_config.fetch("cluster_tier", 1) == 1 -%>
if (req.http.X-Wikimedia-Debug == "1") {
set req.backend = test_wikipedia;
}
@@ -93,13 +93,13 @@
return (deliver);
}
-<% if @vcl_config.fetch("cluster_tier", "1") == "1" -%>
+<% if @vcl_config.fetch("cluster_tier", 1) == 1 -%>
sub vcl_miss {
call mangle_request;
}
<% end -%>
-<% if @vcl_config.fetch("cluster_tier", "1") == "1" -%>
+<% if @vcl_config.fetch("cluster_tier", 1) == 1 -%>
// vcl_pass gets called by hit_for_pass objects in place of vcl_miss, so
// we need to mangle the request object here as well. Actually, vcl_miss
// and vcl_pass should probably be identical for the time being.
diff --git a/templates/varnish/mobile-backend.inc.vcl.erb
b/templates/varnish/mobile-backend.inc.vcl.erb
index 208dadf..e30c3c0 100644
--- a/templates/varnish/mobile-backend.inc.vcl.erb
+++ b/templates/varnish/mobile-backend.inc.vcl.erb
@@ -10,7 +10,7 @@
set req.http.X-Wikimedia-Debug = "1";
}
-<% if @vcl_config.fetch("cluster_tier", "1") == "1" -%>
+<% if @vcl_config.fetch("cluster_tier", 1) == 1 -%>
if (req.http.X-Wikimedia-Debug == "1") {
set req.backend = test_wikipedia;
} else if (req.url ~ "^/w/api\.php") {
diff --git a/templates/varnish/text-backend.inc.vcl.erb
b/templates/varnish/text-backend.inc.vcl.erb
index 3de0d48..bcaf374 100644
--- a/templates/varnish/text-backend.inc.vcl.erb
+++ b/templates/varnish/text-backend.inc.vcl.erb
@@ -3,7 +3,7 @@
include "errorpage.inc.vcl";
include "text-common.inc.vcl";
-<% if @vcl_config.fetch("cluster_tier", "1") != "1" -%>
+<% if @vcl_config.fetch("cluster_tier", 1) != 1 -%>
// A random director with the same backends as the default 'backend' (chash)
director
<%
default_backend = @vcl_config.fetch("default_backend", "backend")
@@ -30,7 +30,7 @@
set req.http.X-Wikimedia-Debug = "1";
}
-<% if @vcl_config.fetch("cluster_tier", "1") == "1" -%>
+<% if @vcl_config.fetch("cluster_tier", 1) == 1 -%>
if (req.url ~ "^/w/api\.php") {
set req.backend = api;
} else if (req.url ~ "^/w/thumb(_handler)?\.php") {
@@ -39,13 +39,13 @@
<% end -%>
if (req.url ~ "^/wiki/Special:CentralAutoLogin/") {
-<% if @vcl_config.fetch("cluster_tier", "1") != "1" -%>
+<% if @vcl_config.fetch("cluster_tier", 1) != 1 -%>
set req.backend = <%= @vcl_config.fetch("default_backend",
"backend") %>_random;
<% end -%>
set req.hash_ignore_busy = true;
}
-<% if @vcl_config.fetch("cluster_tier", "1") == "1" -%>
+<% if @vcl_config.fetch("cluster_tier", 1) == 1 -%>
if (req.http.X-Wikimedia-Debug == "1") {
set req.backend = test_wikipedia;
}
diff --git a/templates/varnish/upload-backend.inc.vcl.erb
b/templates/varnish/upload-backend.inc.vcl.erb
index 5e77fcf..6483682 100644
--- a/templates/varnish/upload-backend.inc.vcl.erb
+++ b/templates/varnish/upload-backend.inc.vcl.erb
@@ -18,7 +18,7 @@
}
}
-<% if @vcl_config.fetch("cluster_tier", "1") == "1" -%>
+<% if @vcl_config.fetch("cluster_tier", 1) == 1 -%>
sub radosgw_rewrite {
if (req.restarts == 0) {
if (req.url ~
"^/[^/]+/[^/]+/((transcoded|thumb|temp)/)?((temp|archive)/)?[0-9a-f]/[0-9a-f]{2}(/.+)?$")
{
diff --git a/templates/varnish/upload-frontend.inc.vcl.erb
b/templates/varnish/upload-frontend.inc.vcl.erb
index 14d7abe..6a5f598 100644
--- a/templates/varnish/upload-frontend.inc.vcl.erb
+++ b/templates/varnish/upload-frontend.inc.vcl.erb
@@ -70,7 +70,7 @@
}
// Stream large objects, >= 1 or 32 MB
-<% stream_threshold = @vcl_config.fetch("cluster_tier", "1") == "1" ? 33554432
: 1048576 -%>
+<% stream_threshold = @vcl_config.fetch("cluster_tier", 1) == 1 ? 33554432 :
1048576 -%>
if (std.integer(beresp.http.Content-Length, 33554432) >= <%=
stream_threshold %> || beresp.http.Content-Length ~ "^[0-9]{9}") {
set beresp.do_stream = true;
if (std.integer(beresp.http.Content-Length, 33554432) >=
33554432 || beresp.http.Content-Length ~ "^[0-9]{9}") {
--
To view, visit https://gerrit.wikimedia.org/r/204773
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If323f9cd7ef1c328e4c557bef09d86647c456233
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
