BBlack has submitted this change and it was merged.
Change subject: cache_misc: move pass-blocks to layer-common code
......................................................................
cache_misc: move pass-blocks to layer-common code
Bug: T119394
Change-Id: I1de9dfbb91f9782b6d099120a954adb2fd622ec5
---
M modules/role/manifests/cache/misc.pp
M templates/varnish/misc-backend.inc.vcl.erb
A templates/varnish/misc-common.inc.vcl.erb
M templates/varnish/misc-frontend.inc.vcl.erb
4 files changed, 26 insertions(+), 36 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/modules/role/manifests/cache/misc.pp
b/modules/role/manifests/cache/misc.pp
index eac4479..a9ce728 100644
--- a/modules/role/manifests/cache/misc.pp
+++ b/modules/role/manifests/cache/misc.pp
@@ -238,6 +238,7 @@
varnish::instance { 'misc-backend':
name => '',
vcl => 'misc-backend',
+ extra_vcl => ['misc-common'],
ports => [ 3128 ],
admin_port => 6083,
storage => $::role::cache::2layer::persistent_storage_args,
@@ -249,6 +250,7 @@
varnish::instance { 'misc-frontend':
name => 'frontend',
vcl => 'misc-frontend',
+ extra_vcl => ['misc-common'],
ports => [ 80 ],
admin_port => 6082,
storage => "-s malloc,${memory_storage_size}G",
diff --git a/templates/varnish/misc-backend.inc.vcl.erb
b/templates/varnish/misc-backend.inc.vcl.erb
index 465d0cb..3adfcb2 100644
--- a/templates/varnish/misc-backend.inc.vcl.erb
+++ b/templates/varnish/misc-backend.inc.vcl.erb
@@ -1,4 +1,5 @@
include "errorpage.inc.vcl";
+include "misc-common.inc.vcl";
sub vcl_recv {
<% if @site_tier == "one" -%>
@@ -63,24 +64,7 @@
}
<% end -%> // end tier-1 backend selection
- // XXX this pass-block is common to all misc VCL, refactor later...
- if (
- req.http.Host == "gerrit.wikimedia.org"
- || req.http.Host == "grafana.wikimedia.org" || req.http.host ==
"grafana-admin.wikimedia.org"
- || req.http.Host == "static-bugzilla.wikimedia.org" || req.http.Host
== "annual.wikimedia.org" || req.http.Host == "transparency.wikimedia.org"
- || req.http.Host == "otrs-test.wikimedia.org" // No caching of OTRS
for now
- || req.http.Host == "people.wikimedia.org" // No caching of
public_html dirs
- || req.http.Host == "datasets.wikimedia.org" // No caching of
datasets. They can be larger than misc varnish can deal with.
- || req.http.Host == "config-master.wikimedia.org"
- || req.http.Host == "etherpad.wikimedia.org" // No caching of configs;
scripts may want to know when things change
- ) {
- return (pass);
- }
-
- if (req.request != "GET" && req.request != "HEAD") {
- // We only deal with GET and HEAD
- return (pass);
- }
+ call misc_recv_pass;
return (lookup);
}
diff --git a/templates/varnish/misc-common.inc.vcl.erb
b/templates/varnish/misc-common.inc.vcl.erb
new file mode 100644
index 0000000..16e4eb4
--- /dev/null
+++ b/templates/varnish/misc-common.inc.vcl.erb
@@ -0,0 +1,20 @@
+
+sub misc_recv_pass {
+ if (
+ req.http.Host == "gerrit.wikimedia.org"
+ || req.http.Host == "grafana.wikimedia.org" || req.http.host ==
"grafana-admin.wikimedia.org"
+ || req.http.Host == "static-bugzilla.wikimedia.org" || req.http.Host
== "annual.wikimedia.org" || req.http.Host == "transparency.wikimedia.org"
+ || req.http.Host == "otrs-test.wikimedia.org" // No caching of OTRS
for now
+ || req.http.Host == "people.wikimedia.org" // No caching of
public_html dirs
+ || req.http.Host == "datasets.wikimedia.org" // No caching of
datasets. They can be larger than misc varnish can deal with.
+ || req.http.Host == "config-master.wikimedia.org"
+ || req.http.Host == "etherpad.wikimedia.org" // No caching of configs;
scripts may want to know when things change
+ ) {
+ return (pass);
+ }
+
+ if (req.request != "GET" && req.request != "HEAD") {
+ // We only deal with GET and HEAD
+ return (pass);
+ }
+}
diff --git a/templates/varnish/misc-frontend.inc.vcl.erb
b/templates/varnish/misc-frontend.inc.vcl.erb
index 3000164..9bd233b 100644
--- a/templates/varnish/misc-frontend.inc.vcl.erb
+++ b/templates/varnish/misc-frontend.inc.vcl.erb
@@ -1,4 +1,5 @@
include "errorpage.inc.vcl";
+include "misc-common.inc.vcl";
sub vcl_recv {
if (req.http.Host == "git.wikimedia.org") {
@@ -26,24 +27,7 @@
}
}
- // XXX this pass-block is common to all misc VCL, refactor later...
- if (
- req.http.Host == "gerrit.wikimedia.org"
- || req.http.Host == "grafana.wikimedia.org" || req.http.host ==
"grafana-admin.wikimedia.org"
- || req.http.Host == "static-bugzilla.wikimedia.org" || req.http.Host
== "annual.wikimedia.org" || req.http.Host == "transparency.wikimedia.org"
- || req.http.Host == "otrs-test.wikimedia.org" // No caching of OTRS
for now
- || req.http.Host == "people.wikimedia.org" // No caching of
public_html dirs
- || req.http.Host == "datasets.wikimedia.org" // No caching of
datasets. They can be larger than misc varnish can deal with.
- || req.http.Host == "config-master.wikimedia.org"
- || req.http.Host == "etherpad.wikimedia.org" // No caching of configs;
scripts may want to know when things change
- ) {
- return (pass);
- }
-
- if (req.request != "GET" && req.request != "HEAD") {
- // We only deal with GET and HEAD
- return (pass);
- }
+ call misc_recv_pass;
return (lookup);
}
--
To view, visit https://gerrit.wikimedia.org/r/256704
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1de9dfbb91f9782b6d099120a954adb2fd622ec5
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
