Mark Bergsma has uploaded a new change for review. https://gerrit.wikimedia.org/r/70416
Change subject: Temporarily split the mobile cluster in old and new ...................................................................... Temporarily split the mobile cluster in old and new The new machines use a much higher chash weight, and would otherwise get the vast majority of requests on an empty cache. This lets us split the traffic between old/new with PyBal. Change-Id: Iad2c046d91ff7ef5831717e9e298c8cad56093e2 --- M manifests/role/cache.pp 1 file changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/16/70416/1 diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp index 81e40e3..893e0c4 100644 --- a/manifests/role/cache.pp +++ b/manifests/role/cache.pp @@ -187,7 +187,9 @@ }, "mobile" => { "pmtpa" => [], - "eqiad" => ["cp1041.eqiad.wmnet", "cp1042.eqiad.wmnet", "cp1043.wikimedia.org", "cp1044.wikimedia.org"], + # FIXME: remove after migration + "eqiad-old" => ["cp1041.eqiad.wmnet", "cp1042.eqiad.wmnet", "cp1043.wikimedia.org", "cp1044.wikimedia.org"], + 'eqiad' => ['cp1046.eqiad.wmnet', 'cp1047.eqiad.wmnet', 'cp1059.eqiad.wmnet', 'cp1060.eqiad.wmnet'], "esams" => ['cp3011.esams.wikimedia.org', 'cp3012.esams.wikimedia.org', 'cp3013.esams.wikimedia.org', 'cp3014.esams.wikimedia.org'], }, "parsoid" => { @@ -874,6 +876,11 @@ } else { class { "varnish::htcppurger": varnish_instances => [ "127.0.0.1:80", "127.0.0.1:3128" ] } } + # FIXME: remove after migration + $suffix = $::hostname ? { + /^cp104[1-4]$/ => "-old", + default => "", + } varnish::instance { "mobile-backend": name => "", @@ -938,7 +945,7 @@ admin_port => 6082, storage => "-s malloc,${memory_storage_size}G", directors => { - "backend" => $::role::cache::configuration::active_nodes[$::realm]['mobile'][$::site], + "backend" => $::role::cache::configuration::active_nodes[$::realm]['mobile']["${::site}${suffix}"], }, director_options => { 'retries' => $backend_weight * size($::role::cache::configuration::active_nodes[$::realm]['mobile'][$::site]), -- To view, visit https://gerrit.wikimedia.org/r/70416 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iad2c046d91ff7ef5831717e9e298c8cad56093e2 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Mark Bergsma <m...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits