EBernhardson has uploaded a new change for review. https://gerrit.wikimedia.org/r/235274
Change subject: Add boilerplate for cirrussearch connection limits ...................................................................... Add boilerplate for cirrussearch connection limits CirrusSearch has some new code to apply rate limiting to specified networks. This patch adds the boilerplate so for networks can be added/removed from. Change-Id: I58e83c83b0e5c8df155fb71b77f37879a4e8cb51 --- M wmf-config/CirrusSearch-common.php M wmf-config/InitialiseSettings.php 2 files changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/74/235274/1 diff --git a/wmf-config/CirrusSearch-common.php b/wmf-config/CirrusSearch-common.php index 9ec0d0e..0c512a9 100644 --- a/wmf-config/CirrusSearch-common.php +++ b/wmf-config/CirrusSearch-common.php @@ -94,6 +94,9 @@ // to all kinds of caches: the linux disk cache, Elasticsearch's filter cache, whatever. $wgCirrusSearchMainPageCacheWarmer = ( $wgCirrusSearchShardCount['content'] > 1 ); +// Enable concurrent search limits for specified abusive networks +$wgCirrusSearchForcePerUserPoolCounter = $wmgCirrusSearchForcePerUserPoolCounter + // Commons is special if ( $wgDBname == 'commonswiki' ) { $wgCirrusSearchNamespaceMappings[ NS_FILE ] = 'file'; diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 7042fc1..6d4fc29 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -15180,6 +15180,11 @@ 'mediawikiwiki' => true, ), +'wmgCirrusSearchForcePerUserPoolCounter = array( + 'default' => array(), +), + + 'wmgCirrusSearchPreferRecentDefaultDecayPortion' => array( 'default' => 0, 'wikinews' => .6, -- To view, visit https://gerrit.wikimedia.org/r/235274 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I58e83c83b0e5c8df155fb71b77f37879a4e8cb51 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits