jenkins-bot has submitted this change and it was merged.
Change subject: Rename $wgCirrusSearchContentReplicaCount to
$wgCirrusSearchReplicaCount
......................................................................
Rename $wgCirrusSearchContentReplicaCount to $wgCirrusSearchReplicaCount
Bug: 58097
Change-Id: I89f3dedc127730d9698d134d9346252b4568931c
---
M CirrusSearch.php
M README
M maintenance/updateOneSearchIndexConfig.php
3 files changed, 8 insertions(+), 8 deletions(-)
Approvals:
Manybubbles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CirrusSearch.php b/CirrusSearch.php
index e65aea0..8655f3c 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -49,7 +49,7 @@
// The default of 0 is fine for single-node setups, but if this is
// deployed to a multi-node setting you probably at least want these
// set to 1 for some redundancy, if not 2 for more redundancy.
-$wgCirrusSearchContentReplicaCount = array( 'content' => 0, 'general' => 0 );
+$wgCirrusSearchReplicaCount = array( 'content' => 0, 'general' => 0 );
// By default, Cirrus will organize pages into one of two indexes (general or
// content) based on whether a page is in a content namespace. This should
@@ -58,7 +58,7 @@
// the value is a string name of what index suffix to use. Changing this
setting
// requires a full reindex (not in-place) of the wiki. If this setting
contains
// any values then the index names must also exist in $wgCirrusSearchShardCount
-// and $wgCirrusSearchContentReplicaCount.
+// and $wgCirrusSearchReplicaCount.
$wgCirrusSearchNamespaceMappings = array();
// Extra indexes (if any) you want to search, and for what namespaces?
diff --git a/README b/README
index 7e0a374..7589d1e 100644
--- a/README
+++ b/README
@@ -15,7 +15,7 @@
$wgCirrusSearchServers = array( 'elasticsearch0', 'elasticsearch1',
'elasticsearch2', 'elasticsearch3' );
There are other $wgCirrusSearch variables that you might want to change from
their defaults.
In production setups, you will very likely want to increase the number of
replicas using
-$wgCirrusSearchContentReplicaCount.
+$wgCirrusSearchReplicaCount.
If you want to change them then set their new values with
$wgCirrusSearchServers in LocalSettings.php.
Now run this script to generate your elasticsearch index:
@@ -173,7 +173,7 @@
during upgrades. More replicas will help distribute queries across more
nodes. Having more
replicas than nodes doesn't make sense and Elasticsearch will stay "yellow" if
you do that.
Anyway, you should add this to LocalSettings.php to change it:
- $wgCirrusSearchContentReplicaCount = array( 'content' => 2, 'general' => 2 );
+ $wgCirrusSearchReplicaCount = array( 'content' => 2, 'general' => 2 );
Testing
diff --git a/maintenance/updateOneSearchIndexConfig.php
b/maintenance/updateOneSearchIndexConfig.php
index af629ed..319fdab 100644
--- a/maintenance/updateOneSearchIndexConfig.php
+++ b/maintenance/updateOneSearchIndexConfig.php
@@ -682,12 +682,12 @@
}
private function getReplicaCount() {
- global $wgCirrusSearchContentReplicaCount;
- if ( !isset( $wgCirrusSearchContentReplicaCount[
$this->indexType ] ) ) {
+ global $wgCirrusSearchReplicaCount;
+ if ( !isset( $wgCirrusSearchReplicaCount[ $this->indexType ] )
) {
$this->error( 'Could not find a replica count for ' .
$this->indexType . '. Did you add an index to ' .
- '$wgCirrusSearchNamespaceMappings but forget to
add it to $wgCirrusSearchContentReplicaCount?', 1 );
+ '$wgCirrusSearchNamespaceMappings but forget to
add it to $wgCirrusSearchReplicaCount?', 1 );
}
- return $wgCirrusSearchContentReplicaCount[ $this->indexType ];
+ return $wgCirrusSearchReplicaCount[ $this->indexType ];
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/100821
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I89f3dedc127730d9698d134d9346252b4568931c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: Manybubbles <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
