jenkins-bot has submitted this change and it was merged.

Change subject: memcached: add configurations for codfw
......................................................................


memcached: add configurations for codfw

Bug: T91754
Change-Id: I360c1272642ed1743d6f82d5b17ddc3f59bda3c8
---
A wmf-config/bloomfilters-codfw.php
A wmf-config/bloomfilters.php
M wmf-config/mc.php
M wmf-config/session.php
4 files changed, 30 insertions(+), 4 deletions(-)

Approvals:
  Chad: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/bloomfilters-codfw.php 
b/wmf-config/bloomfilters-codfw.php
new file mode 100644
index 0000000..6bc5ebf
--- /dev/null
+++ b/wmf-config/bloomfilters-codfw.php
@@ -0,0 +1,5 @@
+<?php
+$wmgBloomFilterServers = array(
+       '10.192.0.33:6379', // rbf2001 - master
+       '10.192.16.36:6379', // rbf2002 - slave
+);
diff --git a/wmf-config/bloomfilters.php b/wmf-config/bloomfilters.php
new file mode 100644
index 0000000..3f785bd
--- /dev/null
+++ b/wmf-config/bloomfilters.php
@@ -0,0 +1,5 @@
+<?php
+$wmgBloomFilterServers = array(
+       '10.64.0.162:6379', // rbf1001 - master
+       '10.64.0.163:6379', // rbf1002 - slave
+);
diff --git a/wmf-config/mc.php b/wmf-config/mc.php
index 05a7e7f..b7cdbeb 100644
--- a/wmf-config/mc.php
+++ b/wmf-config/mc.php
@@ -16,14 +16,12 @@
        'loggroup'             => 'memcached',
 );
 
+require( getRealmSpecificFilename( "$wmfConfigDir/bloomfilters.php" ) );
 /*
 $wgBloomFilterStores['main'] = array(
        'cacheId'      => 'main-v1',
        'class'        => 'BloomCacheRedis',
-       'redisServers' => array(
-               '10.64.0.162:6379', // rbf1001 - master
-               '10.64.0.163:6379', // rbf1002 - slave
-       ),
+       'redisServers' => $wmgBloomFilterServers,
        'redisConfig'  => array(
                'password'       => $wmgRedisPassword,
                'connectTimeout' => .25,
diff --git a/wmf-config/session.php b/wmf-config/session.php
index 6386001..a7f9345 100644
--- a/wmf-config/session.php
+++ b/wmf-config/session.php
@@ -21,4 +21,22 @@
                '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"
+    ),
 );

-- 
To view, visit https://gerrit.wikimedia.org/r/197496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I360c1272642ed1743d6f82d5b17ddc3f59bda3c8
Gerrit-PatchSet: 5
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to