BBlack has submitted this change and it was merged.
Change subject: add various text backend defs to mobile
......................................................................
add various text backend defs to mobile
This adds the backend defs for: backend_random in tier-two and the
rendering, sec audit, and restbase backends in tier-one. It
doesn't actually make use of them yet, which will be in a followup
patch.
Bug: T109286
Change-Id: I0304dc83296e0789f78b894b45d948afe7fd39c2
---
M conftool-data/nodes/codfw.yaml
M conftool-data/nodes/eqiad.yaml
M conftool-data/nodes/esams.yaml
M conftool-data/nodes/ulsfo.yaml
M conftool-data/services/cache.yaml
M modules/role/manifests/cache/mobile.pp
6 files changed, 58 insertions(+), 16 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/conftool-data/nodes/codfw.yaml b/conftool-data/nodes/codfw.yaml
index 6fda2f1..95d7a3d 100644
--- a/conftool-data/nodes/codfw.yaml
+++ b/conftool-data/nodes/codfw.yaml
@@ -204,10 +204,10 @@
cp2019.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
cp2023.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
cache_mobile:
- cp2003.codfw.wmnet: [varnish-fe, varnish-be, nginx]
- cp2009.codfw.wmnet: [varnish-fe, varnish-be, nginx]
- cp2015.codfw.wmnet: [varnish-fe, varnish-be, nginx]
- cp2021.codfw.wmnet: [varnish-fe, varnish-be, nginx]
+ cp2003.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp2009.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp2015.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp2021.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
cache_upload:
cp2002.codfw.wmnet: [varnish-fe, varnish-be, nginx]
cp2005.codfw.wmnet: [varnish-fe, varnish-be, nginx]
diff --git a/conftool-data/nodes/eqiad.yaml b/conftool-data/nodes/eqiad.yaml
index d30fc03..195c61b 100644
--- a/conftool-data/nodes/eqiad.yaml
+++ b/conftool-data/nodes/eqiad.yaml
@@ -241,10 +241,10 @@
cp1067.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
cp1068.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
cache_mobile:
- cp1046.eqiad.wmnet: [varnish-fe, varnish-be, nginx]
- cp1047.eqiad.wmnet: [varnish-fe, varnish-be, nginx]
- cp1059.eqiad.wmnet: [varnish-fe, varnish-be, nginx]
- cp1060.eqiad.wmnet: [varnish-fe, varnish-be, nginx]
+ cp1046.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp1047.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp1059.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp1060.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
cache_upload:
cp1048.eqiad.wmnet: [varnish-fe, varnish-be, nginx]
cp1049.eqiad.wmnet: [varnish-fe, varnish-be, nginx]
diff --git a/conftool-data/nodes/esams.yaml b/conftool-data/nodes/esams.yaml
index d92458e..6972755 100644
--- a/conftool-data/nodes/esams.yaml
+++ b/conftool-data/nodes/esams.yaml
@@ -1,8 +1,8 @@
cache_mobile:
- cp3015.esams.wmnet: [varnish-fe, varnish-be, nginx]
- cp3016.esams.wmnet: [varnish-fe, varnish-be, nginx]
- cp3017.esams.wmnet: [varnish-fe, varnish-be, nginx]
- cp3018.esams.wmnet: [varnish-fe, varnish-be, nginx]
+ cp3015.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp3016.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp3017.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp3018.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
cache_text:
cp3003.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
cp3004.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
diff --git a/conftool-data/nodes/ulsfo.yaml b/conftool-data/nodes/ulsfo.yaml
index 359fbf5..2f689ac 100644
--- a/conftool-data/nodes/ulsfo.yaml
+++ b/conftool-data/nodes/ulsfo.yaml
@@ -1,8 +1,8 @@
cache_mobile:
- cp4011.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
- cp4012.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
- cp4019.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
- cp4020.ulsfo.wmnet: [varnish-fe, varnish-be, nginx]
+ cp4011.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp4012.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp4019.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+ cp4020.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
cache_text:
cp4008.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
cp4009.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
diff --git a/conftool-data/services/cache.yaml
b/conftool-data/services/cache.yaml
index 70381f0..be09e92 100644
--- a/conftool-data/services/cache.yaml
+++ b/conftool-data/services/cache.yaml
@@ -60,6 +60,16 @@
- eqiad
- esams
- ulsfo
+ varnish-be-rand:
+ port: 3128
+ default_values:
+ "pooled": "no"
+ "weight": 10
+ datacenters:
+ - codfw
+ - eqiad
+ - esams
+ - ulsfo
nginx:
port: 443
default_values:
diff --git a/modules/role/manifests/cache/mobile.pp
b/modules/role/manifests/cache/mobile.pp
index b67ee30..19f9830 100644
--- a/modules/role/manifests/cache/mobile.pp
+++ b/modules/role/manifests/cache/mobile.pp
@@ -36,10 +36,25 @@
'type' => 'random',
'backends' =>
$role::cache::configuration::backends[$::realm]['api'][$::mw_primary],
},
+ 'rendering' => {
+ 'dynamic' => 'no',
+ 'type' => 'random',
+ 'backends' =>
$role::cache::configuration::backends[$::realm]['rendering'][$::mw_primary],
+ },
+ 'security_audit' => {
+ 'dynamic' => 'no',
+ 'type' => 'random',
+ 'backends' =>
$role::cache::configuration::backends[$::realm]['security_audit'][$::mw_primary],
+ },
'test_wikipedia' => {
'dynamic' => 'no',
'type' => 'random',
'backends' =>
$role::cache::configuration::backends[$::realm]['test_appservers'][$::mw_primary],
+ },
+ 'restbase_backend' => {
+ 'dynamic' => 'no',
+ 'type' => 'random',
+ 'backends' =>
$role::cache::configuration::backends[$::realm]['restbase'][$::mw_primary],
},
},
'two' => {
@@ -47,6 +62,12 @@
'dynamic' => 'yes',
'type' => 'chash',
'backends' => $mobile_nodes['eqiad'],
+ },
+ 'backend_random' => {
+ 'dynamic' => 'yes',
+ 'type' => 'random',
+ 'backends' => $mobile_nodes['eqiad'],
+ 'service' => 'varnish-be-rand',
},
}
}
@@ -90,6 +111,11 @@
'probe' => 'varnish',
},
{
+ 'backend_match' => '^restbase\.svc\.|^deployment-restbase',
+ 'port' => 7231,
+ 'max_connections' => 5000,
+ },
+ {
'port' => 80,
'connect_timeout' => '5s',
'first_byte_timeout' => '180s',
@@ -114,6 +140,12 @@
'type' => 'chash',
'backends' => $site_mobile_nodes,
},
+ 'backend_random' => {
+ 'dynamic' => 'yes',
+ 'type' => 'random',
+ 'backends' => $site_mobile_nodes,
+ 'service' => 'varnish-be-rand',
+ },
},
vcl_config => {
'retry503' => 1,
--
To view, visit https://gerrit.wikimedia.org/r/234289
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0304dc83296e0789f78b894b45d948afe7fd39c2
Gerrit-PatchSet: 4
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
