BBlack has submitted this change and it was merged.
Change subject: normalize on $cluster_tier as string words
......................................................................
normalize on $cluster_tier as string words
This should reduce any confusion from type conversion, which seems
to be an issue in this instance during some refactoring...
Change-Id: If323f9cd7ef1c328e4c557bef09d86647c456233
---
M modules/role/manifests/cache/base.pp
M modules/role/manifests/cache/bits.pp
M modules/role/manifests/cache/mobile.pp
M modules/role/manifests/cache/text.pp
M modules/role/manifests/cache/upload.pp
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
10 files changed, 27 insertions(+), 27 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, but someone else must approve
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/manifests/cache/base.pp
b/modules/role/manifests/cache/base.pp
index 5999293..9f8d16c 100644
--- a/modules/role/manifests/cache/base.pp
+++ b/modules/role/manifests/cache/base.pp
@@ -11,10 +11,10 @@
# Any changes here will affect all descendent Varnish clusters
# unless they're overridden!
if $::site in ['eqiad'] {
- $cluster_tier = 1
+ $cluster_tier = 'one'
$default_backend = 'backend'
} else {
- $cluster_tier = 2
+ $cluster_tier = 'two'
$default_backend = $::mw_primary
}
$wikimedia_networks = flatten([$network::constants::all_networks,
'127.0.0.0/8', '::1/128'])
diff --git a/modules/role/manifests/cache/bits.pp
b/modules/role/manifests/cache/bits.pp
index 3de0894..59619f8 100644
--- a/modules/role/manifests/cache/bits.pp
+++ b/modules/role/manifests/cache/bits.pp
@@ -16,17 +16,17 @@
}
$varnish_directors = {
- 1 => {
+ 'one' => {
'backend' =>
$::role::cache::configuration::backends[$::realm]['bits_appservers'][$::mw_primary],
'test_wikipedia' =>
$::role::cache::configuration::backends[$::realm]['test_appservers'][$::mw_primary],
},
- 2 => {
+ 'two' => {
'backend' =>
sort(flatten(values($role::cache::configuration::backends[$::realm]['bits']))),
}
}
$probe = $::role::cache::base::cluster_tier ? {
- 1 => 'bits',
+ 'one' => 'bits',
default => 'varnish',
}
case $::realm {
diff --git a/modules/role/manifests/cache/mobile.pp
b/modules/role/manifests/cache/mobile.pp
index 8930b73..cac91b5 100644
--- a/modules/role/manifests/cache/mobile.pp
+++ b/modules/role/manifests/cache/mobile.pp
@@ -30,17 +30,17 @@
require geoip::dev # for VCL compilation using libGeoIP
$varnish_be_directors = {
- 1 => {
+ 'one' => {
'backend' =>
$role::cache::configuration::backends[$::realm]['appservers'][$::mw_primary],
'api' =>
$role::cache::configuration::backends[$::realm]['api'][$::mw_primary],
'test_wikipedia' =>
$role::cache::configuration::backends[$::realm]['test_appservers'][$::mw_primary],
},
- 2 => {
+ 'two' => {
'eqiad' => $mobile_nodes['eqiad'],
}
}
- if $::role::cache::base::cluster_tier == 1 {
+ if $::role::cache::base::cluster_tier == 'one' {
$director_retries = 2
} else {
$director_retries = $::role::cache::2layer::backend_weight_avg * 4
@@ -86,7 +86,7 @@
}
$director_type_cluster = $::role::cache::base::cluster_tier ? {
- 1 => 'random',
+ 'one' => 'random',
default => 'chash',
}
diff --git a/modules/role/manifests/cache/text.pp
b/modules/role/manifests/cache/text.pp
index 947f744..f4a1eac 100644
--- a/modules/role/manifests/cache/text.pp
+++ b/modules/role/manifests/cache/text.pp
@@ -27,13 +27,13 @@
}
$varnish_be_directors = {
- 1 => {
+ 'one' => {
'backend' =>
$role::cache::configuration::backends[$::realm]['appservers'][$::mw_primary],
'api' =>
$role::cache::configuration::backends[$::realm]['api'][$::mw_primary],
'rendering' =>
$role::cache::configuration::backends[$::realm]['rendering'][$::mw_primary],
'test_wikipedia' =>
$role::cache::configuration::backends[$::realm]['test_appservers'][$::mw_primary],
},
- 2 => {
+ 'two' => {
'eqiad' => $text_nodes['eqiad'],
},
}
@@ -57,7 +57,7 @@
}
$director_type_cluster = $::role::cache::base::cluster_tier ? {
- 1 => 'random',
+ 'one' => 'random',
default => 'chash',
}
diff --git a/modules/role/manifests/cache/upload.pp
b/modules/role/manifests/cache/upload.pp
index 180f264..99de110 100644
--- a/modules/role/manifests/cache/upload.pp
+++ b/modules/role/manifests/cache/upload.pp
@@ -24,16 +24,16 @@
}
$varnish_be_directors = {
- 1 => {
+ 'one' => {
'backend' =>
$lvs::configuration::lvs_service_ips[$::realm]['swift'][$::mw_primary],
'rendering' =>
$role::cache::configuration::backends[$::realm]['rendering'][$::mw_primary],
},
- 2 => {
+ 'two' => {
'eqiad' => $upload_nodes['eqiad'],
}
}
- if $::role::cache::base::cluster_tier == 1 {
+ if $::role::cache::base::cluster_tier == 'one' {
$director_retries = 2
} else {
$director_retries = $::role::cache::2layer::backend_weight_avg * 4
@@ -84,7 +84,7 @@
], ' ')
$director_type_cluster = $::role::cache::base::cluster_tier ? {
- 1 => 'random',
+ 'one' => 'random',
default => 'chash',
}
diff --git a/templates/varnish/bits.inc.vcl.erb
b/templates/varnish/bits.inc.vcl.erb
index d1df615..e12c3f6 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", "one") == "one" -%>
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", "one") == "one" -%>
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", "one") == "one" -%>
sub vcl_miss {
call mangle_request;
}
<% end -%>
-<% if @vcl_config.fetch("cluster_tier", "1") == "1" -%>
+<% if @vcl_config.fetch("cluster_tier", "one") == "one" -%>
// 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..a20f098 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", "one") == "one" -%>
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..62d6571 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", "one") != "one" -%>
// 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", "one") == "one" -%>
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", "one") != "one" -%>
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", "one") == "one" -%>
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..349d958 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", "one") == "one" -%>
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..53f0efe 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", "one") == "one" ?
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: merged
Gerrit-Change-Id: If323f9cd7ef1c328e4c557bef09d86647c456233
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
