Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266514
Change subject: Configure redis LockManager in both DCs, use the master
everywhere.
......................................................................
Configure redis LockManager in both DCs, use the master everywhere.
Change-Id: Ia4ddf4a96edf49c8fb2047d9ad85fe641c834a38
---
M wmf-config/ProductionServices.php
M wmf-config/filebackend-production.php
2 files changed, 14 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/14/266514/1
diff --git a/wmf-config/ProductionServices.php
b/wmf-config/ProductionServices.php
index f317ef9..4ec034b 100644
--- a/wmf-config/ProductionServices.php
+++ b/wmf-config/ProductionServices.php
@@ -72,6 +72,19 @@
'10.192.0.121',
);
+### LockManager Redis
+$wmfAllServices['eqiad']['redis_lock'] = array(
+ 'rdb1' => '10.64.0.180',
+ 'rdb2' => '10.64.0.181',
+ 'rdb3' => '10.64.0.182'
+);
+$wmfAllServices['codfw']['redis_lock'] = array(
+ 'rdb1' => '10.192.0.34',
+ 'rdb2' => '10.192.16.37',
+ 'rdb3' => '10.192.32.20',
+);
+
+
# Shorthand when we have no master-slave situation to keep into account
$wmfLocalServices = $wmfAllServices[$wmfDatacenter];
diff --git a/wmf-config/filebackend-production.php
b/wmf-config/filebackend-production.php
index 9e43842..020b96a 100644
--- a/wmf-config/filebackend-production.php
+++ b/wmf-config/filebackend-production.php
@@ -123,11 +123,7 @@
$wgLockManagers[] = array(
'name' => 'redisLockManager',
'class' => 'RedisLockManager',
- 'lockServers' => array(
- 'rdb1' => '10.64.0.180',
- 'rdb2' => '10.64.0.181',
- 'rdb3' => '10.64.0.182'
- ),
+ 'lockServers' => $wmfMasterServices['redis_lock'],
'srvsByBucket' => array(
0 => array( 'rdb1', 'rdb2', 'rdb3' )
),
--
To view, visit https://gerrit.wikimedia.org/r/266514
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4ddf4a96edf49c8fb2047d9ad85fe641c834a38
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
