jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/346542 )
Change subject: [cirrus] Increase max field count for wikidata
......................................................................
[cirrus] Increase max field count for wikidata
Needed to index wikibase labels
Change-Id: Iff1f5368aae3ae3f79bfdff6309cea22f569b6ee
---
M wmf-config/CirrusSearch-common.php
M wmf-config/InitialiseSettings.php
2 files changed, 27 insertions(+), 18 deletions(-)
Approvals:
Smalyshev: Looks good to me, but someone else must approve
Niharika29: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CirrusSearch-common.php
b/wmf-config/CirrusSearch-common.php
index 3b01bf4..e960bbd 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -253,24 +253,8 @@
],
];
-// Setup our custom index settings, only used at index
-// creation time.
-$wgCirrusSearchExtraIndexSettings = [
- // indexing slow log
- 'indexing.slowlog.threshold.index.warn' => '10s',
- 'indexing.slowlog.threshold.index.info' => '5s',
- 'indexing.slowlog.threshold.index.debug' => '2s',
- 'indexing.slowlog.threshold.index.trace' => -1,
- // search slow log
- 'search.slowlog.threshold.fetch.warn' => '1s',
- 'search.slowlog.threshold.fetch.info' => '800ms',
- 'search.slowlog.threshold.fetch.debug' => '500ms',
- 'search.slowlog.threshold.fetch.trace' => '200ms',
- // Number of merge threads to use. Use only 1 thread
- // (instead of 3) to avoid updates interfering with
- // actual searches
- 'merge.scheduler.max_thread_count' => 1,
-];
+// Configure extra index settings set during index creation
+$wgCirrusSearchExtraIndexSettings = $wmgCirrusSearchExtraIndexSettings;
# Load per realm specific configuration, either:
# - CirrusSearch-labs.php
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 3c53e7b..a96ee9c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17519,6 +17519,31 @@
'zhwiki' => [ 'content' => 1 ],
],
+// Setup our custom index settings, only used at index
+// creation time.
+'wmgCirrusSearchExtraIndexSettings' => [
+ 'default' => [
+ // indexing slow log
+ 'indexing.slowlog.threshold.index.warn' => '10s',
+ 'indexing.slowlog.threshold.index.info' => '5s',
+ 'indexing.slowlog.threshold.index.debug' => '2s',
+ 'indexing.slowlog.threshold.index.trace' => -1,
+ // search slow log
+ 'search.slowlog.threshold.fetch.warn' => '1s',
+ 'search.slowlog.threshold.fetch.info' => '800ms',
+ 'search.slowlog.threshold.fetch.debug' => '500ms',
+ 'search.slowlog.threshold.fetch.trace' => '200ms',
+ // Number of merge threads to use. Use only 1 thread
+ // (instead of 3) to avoid updates interfering with
+ // actual searches
+ 'merge.scheduler.max_thread_count' => 1,
+ ],
+ '+wikidatawiki' => [
+ // increase defaults to add language specific fields
+ 'index.mapping.total_fields.limit' => 5000,
+ ],
+],
+
// Enable completion suggester on all wikis (except wikidata)
'wmgCirrusSearchUseCompletionSuggester' => [
'default' => 'yes',
--
To view, visit https://gerrit.wikimedia.org/r/346542
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iff1f5368aae3ae3f79bfdff6309cea22f569b6ee
Gerrit-PatchSet: 5
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: DCausse <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Niharika29 <[email protected]>
Gerrit-Reviewer: Smalyshev <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
