Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Graphoid: Varnish configuration
......................................................................
Graphoid: Varnish configuration
This patch enables graphoid requests to pass through the parsoidcache
Varnish layer to graphoid.svc.eqiad.wmnet
Bug: T90487
Change-Id: I85da31d57ae02f07051203590581df68632d315a
---
M modules/role/manifests/cache/configuration.pp
M modules/role/manifests/cache/parsoid.pp
M templates/varnish/parsoid-common.inc.vcl.erb
M templates/varnish/parsoid-frontend.inc.vcl.erb
4 files changed, 22 insertions(+), 0 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/manifests/cache/configuration.pp
b/modules/role/manifests/cache/configuration.pp
index 49e8b2d..a567f2d 100644
--- a/modules/role/manifests/cache/configuration.pp
+++ b/modules/role/manifests/cache/configuration.pp
@@ -24,6 +24,9 @@
'citoid' => {
'eqiad' => 'citoid.svc.eqiad.wmnet',
},
+ 'graphoid' => {
+ 'eqiad' => 'graphoid.svc.eqiad.wmnet',
+ },
'restbase' => {
'eqiad' => 'restbase.svc.eqiad.wmnet',
},
diff --git a/modules/role/manifests/cache/parsoid.pp
b/modules/role/manifests/cache/parsoid.pp
index 8aa9910..851b02b 100644
--- a/modules/role/manifests/cache/parsoid.pp
+++ b/modules/role/manifests/cache/parsoid.pp
@@ -27,6 +27,7 @@
'backend' =>
$::role::cache::configuration::backends[$::realm]['parsoid'][$::mw_primary],
'cxserver_backend' =>
$::role::cache::configuration::backends[$::realm]['cxserver'][$::site],
'citoid_backend' =>
$::role::cache::configuration::backends[$::realm]['citoid'][$::site],
+ 'graphoid_backend' =>
$::role::cache::configuration::backends[$::realm]['graphoid'][$::site],
'restbase_backend' =>
$::role::cache::configuration::backends[$::realm]['restbase'][$::site],
},
director_options => {
@@ -46,6 +47,11 @@
{
'backend_match' => '^citoid',
'port' => 1970,
+ 'probe' => false,
+ },
+ {
+ 'backend_match' => '^graphoid',
+ 'port' => 19000,
'probe' => false,
},
{
@@ -73,6 +79,7 @@
'backend' => $site_parsoid_nodes,
'cxserver_backend' =>
$::role::cache::configuration::backends[$::realm]['cxserver'][$::site],
'citoid_backend' =>
$::role::cache::configuration::backends[$::realm]['citoid'][$::site],
+ 'graphoid_backend' =>
$::role::cache::configuration::backends[$::realm]['graphoid'][$::site],
'restbase_backend' =>
$::role::cache::configuration::backends[$::realm]['restbase'][$::site],
},
director_type => 'chash',
@@ -95,6 +102,11 @@
'probe' => false,
},
{
+ 'backend_match' => '^graphoid',
+ 'port' => 19000,
+ 'probe' => false,
+ },
+ {
'backend_match' => '^restbase',
'port' => 7231,
'probe' => false, # TODO: Need probe here
diff --git a/templates/varnish/parsoid-common.inc.vcl.erb
b/templates/varnish/parsoid-common.inc.vcl.erb
index a42b0a1..14acef9 100644
--- a/templates/varnish/parsoid-common.inc.vcl.erb
+++ b/templates/varnish/parsoid-common.inc.vcl.erb
@@ -9,6 +9,10 @@
set req.backend = citoid_backend;
return (pass);
}
+ if (req.http.Host ~ "graphoid" ) {
+ set req.backend = graphoid_backend;
+ return (pass);
+ }
if (req.http.Host ~ "restbase" || req.http.Host ~ "rest\." ) {
set req.backend = restbase_backend;
return (pass);
diff --git a/templates/varnish/parsoid-frontend.inc.vcl.erb
b/templates/varnish/parsoid-frontend.inc.vcl.erb
index df212c5..0b66734 100644
--- a/templates/varnish/parsoid-frontend.inc.vcl.erb
+++ b/templates/varnish/parsoid-frontend.inc.vcl.erb
@@ -25,6 +25,9 @@
if (req.http.Host ~ "citoid") {
return (hit_for_pass);
}
+ if (req.http.Host ~ "graphoid") {
+ return (hit_for_pass);
+ }
if (req.http.Host ~ "restbase" || req.http.Host ~ "rest\.") {
// Dummy endpoint for eager DNS resolution / TLS handshake.
if (req.url ~ "^/_preconnect") {
--
To view, visit https://gerrit.wikimedia.org/r/206108
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I85da31d57ae02f07051203590581df68632d315a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
