Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/99543
Change subject: Tweaked $wgJobQueueAggregator to use redis job servers and have
failover
......................................................................
Tweaked $wgJobQueueAggregator to use redis job servers and have failover
Change-Id: I6bd3936c7ee72c63dcbca00c52440ebddcd4563c
---
M docroot/bits/WikipediaMobileFirefoxOS
M wmf-config/jobqueue-eqiad.php
M wmf-config/jobqueue-pmtpa.php
3 files changed, 10 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/43/99543/1
diff --git a/docroot/bits/WikipediaMobileFirefoxOS
b/docroot/bits/WikipediaMobileFirefoxOS
index f12b7b2..287a259 160000
--- a/docroot/bits/WikipediaMobileFirefoxOS
+++ b/docroot/bits/WikipediaMobileFirefoxOS
-Subproject commit f12b7b2122797c0602c10a1f902955998143f3e4
+Subproject commit 287a259d94d63ba2aab05c9d591d482928adc11b
diff --git a/wmf-config/jobqueue-eqiad.php b/wmf-config/jobqueue-eqiad.php
index f5823e5..35ff276 100644
--- a/wmf-config/jobqueue-eqiad.php
+++ b/wmf-config/jobqueue-eqiad.php
@@ -33,9 +33,12 @@
);
// Note: on server failure, this should be changed to any other redis server
$wgJobQueueAggregator = array(
- 'class' => 'JobQueueAggregatorRedis',
- 'redisServer' => '10.64.0.180', # mc1001
- 'redisConfig' => array(
+ 'class' => 'JobQueueAggregatorRedis',
+ 'redisServers' => array( // all after the first are fallbacks
+ '10.64.32.76', # rdb1001
+ '10.64.0.201', # rdb1003
+ ),
+ 'redisConfig' => array(
'connectTimeout' => 2,
'password' => $wmgRedisPassword,
)
diff --git a/wmf-config/jobqueue-pmtpa.php b/wmf-config/jobqueue-pmtpa.php
index 9919411..9cbda9a 100644
--- a/wmf-config/jobqueue-pmtpa.php
+++ b/wmf-config/jobqueue-pmtpa.php
@@ -33,7 +33,10 @@
// Note: on server failure, this should be changed to any other redis server
$wgJobQueueAggregator = array(
'class' => 'JobQueueAggregatorRedis',
- 'redisServer' => '10.64.0.180', # mc1001
+ 'redisServers' => array( // all after the first are fallbacks
+ '10.64.32.76', # rdb1001
+ '10.64.0.201', # rdb1003
+ ),
#'redisServer' => '10.0.12.1', # mc1
'redisConfig' => array(
'connectTimeout' => 1,
--
To view, visit https://gerrit.wikimedia.org/r/99543
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6bd3936c7ee72c63dcbca00c52440ebddcd4563c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
