Page MenuHomePhabricator

wmf config inherit settings
ArchivedPublic

Authored by demon on Oct 30 2014, 9:54 PM.
diff --git a/wmf-config/CirrusSearch-common.php b/wmf-config/CirrusSearch-common.php
index bcbc85c..81f6641 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -67,6 +67,7 @@ $wgCirrusSearchOptimizeIndexForExperimentalHighlighter = true;
# Settings customized per index.
$wgCirrusSearchShardCount = $wmgCirrusSearchShardCount;
+$wgCirrusSearchReplicas = $wmgCirrusSearchReplicas;
$wgCirrusSearchMaxShardsPerNode = $wmgCirrusSearchMaxShardsPerNode;
$wgCirrusSearchPreferRecentDefaultDecayPortion = $wmgCirrusSearchPreferRecentDefaultDecayPortion;
$wgCirrusSearchBoostLinks = $wmgCirrusSearchBoostLinks;
diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php
index 3427790..d936740 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14057,6 +14057,15 @@ $wgConf->settings = array(
'zhwikisource' => array( 'content' => 5, 'general' => 1 ),
),
+// Most wikis are fine with 0-2 replicas for all indexes
+// some of the larger ones will want more replicas for content indexes
+'wmgCirrusSearchReplicas' => array(
+ 'default' => array( 'content' => '0-2', 'general' => '0-2' ),
+ '+commonswiki' => array( 'file' => '0-3' ),
+ '+dewiki' => array( 'content' => '0-3' ),
+ '+enwiki' => array( 'content' => '0-3' ),
+),
+
'wmgCirrusSearchMaxShardsPerNode' => array(
'default' => array(),
'commonswiki' => array( 'file' => 1, 'general' => 2 ),