[MediaWiki-commits] [Gerrit] Prepare GeoData config for Elasticsearch switchover - change (operations/mediawiki-config)

[jenkins-bot (Code Review)]

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

Change subject: Prepare GeoData config for Elasticsearch switchover
......................................................................


Prepare GeoData config for Elasticsearch switchover

Make backend configurable per wiki and per realm.
Because neither of 2 variables have been changed, this commit is a no-op.

Change-Id: I7e9595ce0d2c05636eb654b3e1c91738fba6d669
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
3 files changed, 14 insertions(+), 1 deletion(-)

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



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 4268384..0d4a6e4 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2241,13 +2241,14 @@
 
 if ( $wmgEnableGeoData ) {
        require_once( "$IP/extensions/GeoData/GeoData.php" );
-       $wgGeoDataBackend = 'solr';
+       $wgGeoDataBackend = $wmgGeoDataBackend;
        $wgGeoDataSolrMaster = 'solr1001.eqiad.wmnet';
        $wgGeoDataSolrHosts = array(
                'solr1001.eqiad.wmnet' => 75, // master, put less read load on 
it
                'solr1002.eqiad.wmnet' => 100,
                'solr1003.eqiad.wmnet' => 100,
        );
+       $wgGeoDataUseCirrusSearch = $wmgGeoDataUseCirrusSearch;
 
        # Data collection mode
        if ( !$wmgEnableGeoSearch ) {
diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 8e3733b..a3a6190 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -223,6 +223,12 @@
        'wmgEnableGeoData' => array(
                'default' => true,
        ),
+       'wmgGeoDataBackend' => array(
+               'default' => 'solr',
+       ),
+       'wmgGeoDataUseCirrusSearch' => array(
+               'default' => false,
+       ),
 
        'wmgULSPosition' => array(
                # Beta-specific
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index d8dc33a..85a0d24 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12269,6 +12269,12 @@
        'wiki' => true,
        'wikivoyage' => true,
 ),
+'wmgGeoDataBackend' => array(
+       'default' => 'solr',
+),
+'wmgGeoDataUseCirrusSearch' => array(
+       'default' => false,
+),
 'wmgEnableGeoSearch' => array(
        'default' => true,
        'loginwiki' => false,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7e9595ce0d2c05636eb654b3e1c91738fba6d669
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem <maxsem.w...@gmail.com>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits