EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/286485
Change subject: cirrus: Only use curl pools on hhvm
......................................................................
cirrus: Only use curl pools on hhvm
Maintenance scripts are still run using zend which logs some warnings
when using the pooled curl because it's not supported. To resolve the
warnings check for HHVM_VERSION and only use the pooled curl when we are
running under HHVM.
Bug: T132751
Change-Id: I612b60f3eb152bbcbc35ba8ad736511556d7781d
---
M wmf-config/CirrusSearch-production.php
1 file changed, 10 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/85/286485/1
diff --git a/wmf-config/CirrusSearch-production.php
b/wmf-config/CirrusSearch-production.php
index dc2239f..b3ae363 100644
--- a/wmf-config/CirrusSearch-production.php
+++ b/wmf-config/CirrusSearch-production.php
@@ -11,7 +11,12 @@
$wgCirrusSearchMasterTimeout = '2m';
$wgCirrusSearchClusters = array(
- 'eqiad' => array_map( function ( $host ) {
+ 'eqiad' => $wmfAllServices['eqiad']['search'],
+ 'codfw' => $wmfAllServices['codfw']['search'],
+ 'labsearch' => array( '10.64.37.14' ), // nobelium.eqiad.wmnet
+);
+if ( defined( 'HHVM_VERSION' ) ) {
+ $wgCirrusSearchClusters['eqiad'] = array_map( function ( $host ) {
return array(
'transport' => 'CirrusSearch\\Elastica\\PooledHttps',
'port' => '9243',
@@ -20,8 +25,8 @@
'pool' => 'cirrus-eqiad',
),
);
- }, $wmfAllServices['eqiad']['search'] ),
- 'codfw' => array_map( function ( $host ) {
+ }, $wgCirrusSearchClusters['eqiad'] );
+ $wgCirrusSearchClusters['codfw'] = array_map( function ( $host ) {
return array(
'transport' => 'CirrusSearch\\Elastica\\PooledHttps',
'port' => '9243',
@@ -30,9 +35,8 @@
'pool' => 'cirrus-codfw',
),
);
- }, $wmfAllServices['codfw']['search'] ),
- 'labsearch' => array( '10.64.37.14' ), // nobelium.eqiad.wmnet
-);
+ }, $wgCirrusSearchClusters['codfw'] );
+}
if ( $wgDBname === 'labswiki' || $wgDBname === 'labtestwiki' ) {
$wgCirrusSearchClusters = array(
--
To view, visit https://gerrit.wikimedia.org/r/286485
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I612b60f3eb152bbcbc35ba8ad736511556d7781d
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
