Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/228178
Change subject: Use $sessionRedis to set redis server
......................................................................
Use $sessionRedis to set redis server
This allows realm-specific overrides, which we currently need for labs.
Change-Id: I60ed4b644c4d6e191969d0571523eb1bba93cba7
---
M wmf-config/CommonSettings.php
M wmf-config/session.php
2 files changed, 3 insertions(+), 39 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/78/228178/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 9e22ca3..23e7dc3 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -307,7 +307,7 @@
$wgObjectCaches['sessions'] = array(
'class' => 'RedisBagOStuff',
- 'servers' => array( '127.0.0.1:6380' ),
+ 'servers' => $sessionRedis[$wmfDatacenter],
'password' => $wmgRedisPassword,
'loggroup' => 'redis',
);
diff --git a/wmf-config/session.php b/wmf-config/session.php
index a7f9345..37f41f9 100644
--- a/wmf-config/session.php
+++ b/wmf-config/session.php
@@ -1,42 +1,6 @@
<?php
$sessionRedis = array(
- 'eqiad' => array(
- '10.64.0.180', # mc1001
- '10.64.0.181', # mc1002
- '10.64.0.182', # mc1003
- '10.64.0.183', # mc1004
- '10.64.0.184', # mc1005
- '10.64.0.185', # mc1006
- '10.64.32.161', # mc1007
- '10.64.32.162', # mc1008
- '10.64.32.163', # mc1009
- '10.64.32.164', # mc1010
- '10.64.32.165', # mc1011
- '10.64.32.166', # mc1012
- '10.64.48.101', # mc1013
- '10.64.48.102', # mc1014
- '10.64.48.103', # mc1015
- '10.64.48.104', # mc1016
- '10.64.48.95', # mc1017
- '10.64.48.96', # mc1018
- ),
- 'codfw' => array(
- '10.192.0.34', # "shard1"
- '10.192.0.35', # "shard2"
- '10.192.0.36', # "shard3"
- '10.192.0.37', # "shard4"
- '10.192.0.38', # "shard5"
- '10.192.0.39', # "shard6"
- '10.192.16.37', # "shard7"
- '10.192.16.38', # "shard8"
- '10.192.16.39', # "shard9"
- '10.192.16.40', # "shard10"
- '10.192.16.41', # "shard11"
- '10.192.16.42', # "shard12"
- '10.192.32.20', # "shard13"
- '10.192.32.21', # "shard14"
- '10.192.32.22', # "shard15"
- '10.192.32.23', # "shard16"
- ),
+ 'eqiad' => array( '127.0.0.1:6380' ),
+ 'codfw' => array( '127.0.0.1:6380' ),
);
--
To view, visit https://gerrit.wikimedia.org/r/228178
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I60ed4b644c4d6e191969d0571523eb1bba93cba7
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
