jenkins-bot has submitted this change and it was merged.
Change subject: Revert "Enable config for all three search clusters, but only
write to eqiad"
......................................................................
Revert "Enable config for all three search clusters, but only write to eqiad"
Something is going wrong at commonswiki and spewing errors,
need to investigate before re-submitting.
This reverts commit cd5abd3e78d0a37234e4027ad1e506184f85a831.
Change-Id: I74a7db530b5793fb2f8c28256b1a055451164859
---
M tests/cirrusTest.php
M wmf-config/CirrusSearch-common.php
M wmf-config/CirrusSearch-labs.php
M wmf-config/CirrusSearch-production.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
7 files changed, 53 insertions(+), 83 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/cirrusTest.php b/tests/cirrusTest.php
index c07c497..131b68a 100644
--- a/tests/cirrusTest.php
+++ b/tests/cirrusTest.php
@@ -10,50 +10,21 @@
$this->assertArrayHasKey( 'wgCirrusSearchClusters', $config );
$this->assertArrayHasKey( 'wgCirrusSearchDefaultCluster',
$config );
$this->assertEquals( 'eqiad',
$config['wgCirrusSearchDefaultCluster'] );
- $this->assertCount( 3, $config['wgCirrusSearchClusters'] );
-
- // testwiki writes to eqiad and the lab replica
- $this->assertCount( 2, $config['wgCirrusSearchWriteClusters'] );
-
- $this->assertArrayHasKey(
- $config['wgCirrusSearchDefaultCluster'],
- $config['wgCirrusSearchClusters']
- );
-
- foreach ( $config['wgCirrusSearchWriteClusters'] as
$writeCluster ) {
- $this->assertArrayHasKey(
- $writeCluster,
- $config['wgCirrusSearchClusters']
- );
- }
}
public function testClusterConfigurationForProdEnwiki() {
$config = $this->loadCirrusConfig( 'production', 'enwiki',
'wiki', 'en', 'wikipedia' );
- $this->assertArrayNotHasKey( 'wgCirrusSearchServers', $config );
+ $this->assertArrayHasKey( 'wgCirrusSearchServers', $config );
$this->assertArrayHasKey( 'wgCirrusSearchClusters', $config );
- $this->assertArrayHasKey( 'wgCirrusSearchDefaultCluster',
$config );
- $this->assertCount( 3, $config['wgCirrusSearchClusters'] );
- $this->assertCount( 3, $config['wgCirrusSearchShardCount'] );
- $this->assertCount( 3, $config['wgCirrusSearchReplicas'] );
- $this->assertCount( 3,
$config['wgCirrusSearchClientSideConnectTimeout'] );
-
- foreach ( array_keys ( $config['wgCirrusSearchClusters'] ) as
$cluster ) {
- $this->assertArrayHasKey( $cluster,
$config['wgCirrusSearchShardCount'] );
- $this->assertArrayHasKey( $cluster,
$config['wgCirrusSearchReplicas'] );
- $this->assertArrayHasKey( $cluster,
$config['wgCirrusSearchClientSideConnectTimeout'] );
- }
-
- // Only eqiad for now
- $this->assertCount( 1, $config['wgCirrusSearchWriteClusters'] );
- $this->assertArrayHasKey(
- $config['wgCirrusSearchDefaultCluster'],
- $config['wgCirrusSearchClusters']
+ $this->assertCount( 1, $config['wgCirrusSearchClusters'] );
+ $this->assertEquals(
+ $config['wgCirrusSearchServers'],
+ reset( $config['wgCirrusSearchClusters'] )
);
-
- $this->assertArrayHasKey(
- reset( $config['wgCirrusSearchWriteClusters'] ),
- $config['wgCirrusSearchClusters']
+ $clusters = array_keys( $config['wgCirrusSearchClusters'] );
+ $this->assertEquals(
+ $config['wgCirrusSearchDefaultCluster'],
+ reset( $clusters )
);
}
diff --git a/wmf-config/CirrusSearch-common.php
b/wmf-config/CirrusSearch-common.php
index 4dbbdfd..5e419f5 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -21,10 +21,11 @@
$wgJobTypeConf['default'];
}
-# Set up the the default cluster to send queries to,
-# and the list of clusters to write to.
+if ( isset( $wmgCirrusSearchServers ) ) {
+ $wgCirrusSearchServers = $wmgCirrusSearchServers;
+}
+$wgCirrusSearchClusters = $wmgCirrusSearchClusters;
$wgCirrusSearchDefaultCluster = $wmgCirrusSearchDefaultCluster;
-$wgCirrusSearchWriteClusters = $wmgCirrusSearchWriteClusters;
# Enable user testing
$wgCirrusSearchUserTesting = $wmgCirrusSearchUserTesting;
diff --git a/wmf-config/CirrusSearch-labs.php b/wmf-config/CirrusSearch-labs.php
index d0e97d3..f5edb48 100644
--- a/wmf-config/CirrusSearch-labs.php
+++ b/wmf-config/CirrusSearch-labs.php
@@ -5,15 +5,6 @@
# to the 'labs' realm which in most of the cases means the beta cluster.
# It should be loaded AFTER CirrusSearch-common.php
-$wgCirrusSearchClusters = array(
- 'eqiad' => array(
- 'deployment-elastic05',
- 'deployment-elastic06',
- 'deployment-elastic07',
- 'deployment-elastic08',
- ),
-);
-
if ( $wgDBname == 'enwiki' ) {
$wgCirrusSearchInterwikiSources = array(
'wiktionary' => 'enwiktionary',
@@ -35,9 +26,6 @@
'phrase' => array(
)
);
-
-# write to all configured clusters, there should only be one in labs
-$wgCirrusSearchWriteClusters = null;
$wgCirrusSearchEnableSearchLogging = true;
diff --git a/wmf-config/CirrusSearch-production.php
b/wmf-config/CirrusSearch-production.php
index 487ac1d..1bb20f7 100644
--- a/wmf-config/CirrusSearch-production.php
+++ b/wmf-config/CirrusSearch-production.php
@@ -6,12 +6,6 @@
# It should be loaded AFTER CirrusSearch-common.php
-$wgCirrusSearchClusters = array(
- 'eqiad' => array( '10.2.2.30' ), // search.svc.eqiad.wmnet
- 'codfw' => array( '10.2.1.30' ), // search.svc.codfw.wmnet
- 'labsearch' => array( '10.64.37.14' ), // nobelium.eqiad.wmnet
-);
-
$wgCirrusSearchConnectionAttempts = 3;
$wgCirrusSearchBackup['backups'] = array(
@@ -48,23 +42,3 @@
}
$wgCirrusSearchEnableSearchLogging = true;
-
-// The default configuration is a single-cluster configuration, expand
-// that here into the necessary multi-cluster config
-$wgCirrusSearchShardCount = array(
- 'eqiad' => $wgCirrusSearchShardCount,
- 'codfw' => array_map( function($x) { return min( 7, $x ); },
$wgCirrusSearchShardCount ),
- 'labsearch' => array_map( function() { return 1; },
$wgCirrusSearchShardCount ),
-);
-
-$wgCirrusSearchReplicas = array(
- 'eqiad' => $wgCirrusSearchReplicas,
- 'codfw' => $wgCirrusSearchReplicas,
- 'labsearch' => array_map( function() { return 'false'; },
$wgCirrusSearchReplicas ),
-);
-
-$wgCirrusSearchClientSideConnectTimeout = array(
- 'eqiad' => $wmfDatacenter === 'eqiad' ? 5 : 10,
- 'codfw' => $wmfDatacenter === 'codfw' ? 5 : 10,
- 'labsearch' => 2,
-);
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 5a6a673..c7037ec 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2179,7 +2179,7 @@
if ( $wmgUseTranslationMemory ) {
$servers = array_map(
function ( $v ) { return array( 'host' => $v ); },
- $wgCirrusSearchClusters[$wgCirrusSearchDefaultCluster]
+ isset( $wgCirrusSearchServers ) ?
$wgCirrusSearchServers : $wgCirrusSearchClusters[$wgCirrusSearchDefaultCluster]
);
// Read only until renamed to 'TTMServer'
$wgTranslateTranslationServices['TTMServer'] = array(
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index 8bc71be..9240aa7 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -947,6 +947,32 @@
'wmgUseCirrus' => array(
'default' => true,
+ 'commonswiki' => true,
+ 'dewiki' => true,
+ 'enwiki' => true,
+ 'eswiki' => true,
+ 'frwiki' => true,
+ 'jawiki' => true,
+ 'nlwiki' => true,
+ 'plwiki' => true,
+ 'ruwiki' => true,
+ 'svwiki' => true,
+ 'zhwiki' => true,
+ ),
+
+ '-wmgCirrusSearchServers' => array(
+ 'default' => null,
+ ),
+
+ '-wmgCirrusSearchClusters' => array(
+ 'default' => array(
+ 'eqiad' => array(
+ 'deployment-elastic05',
+ 'deployment-elastic06',
+ 'deployment-elastic07',
+ 'deployment-elastic08',
+ ),
+ ),
),
'wmgUseFlow' => array(
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index eb5ee6a..c6d074f 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -15334,13 +15334,23 @@
'default' => true,
),
+'wmgCirrusSearchServers' => array(
+ 'default' => array( '10.2.2.30' ), // search.svc.eqiad.wmnet
+ 'testwiki' => null,
+),
+
'wmgCirrusSearchDefaultCluster' => array(
'default' => 'eqiad',
),
-'wmgCirrusSearchWriteClusters' => array(
- 'default' => array( 'eqiad' ),
- 'testwiki' => array( 'eqiad', 'labsearch' )
+'wmgCirrusSearchClusters' => array(
+ 'default' => array(
+ 'eqiad' => array( '10.2.2.30' ), // search.svc.eqiad.wmnet
+ ),
+ 'testwiki' => array(
+ 'eqiad' => array( '10.2.2.30' ), // search.svc.eqiad.wmnet
+ 'labsearch' => array( 'nobelium.eqiad.wmnet' ),
+ ),
),
'wmgCirrusPerUserPoolCounter' => array(
--
To view, visit https://gerrit.wikimedia.org/r/247476
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I74a7db530b5793fb2f8c28256b1a055451164859
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
