jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387281 )

Change subject: Properly check for cluster existence prior setting TTM mirrors
......................................................................


Properly check for cluster existence prior setting TTM mirrors

in labs we have a single cluster we should avoid setting mirrors to
inexistent cluster.

Bug: T179270
Change-Id: I73f1db96abceaf3eb08fb946d4e3f5213d657069
---
M wmf-config/CommonSettings.php
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified
  Nikerabbit: Looks good to me, but someone else must approve



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index fee99bd..9f952aa 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2528,9 +2528,11 @@
                // mirroring in this var to avoid logspam about ttm updates
                // then plan to refresh this index via ttmserver-export when
                // it's back up.
+               // NOTE: these settings are also used for the labs cluster
+               // where codfw may not be available
                $wgTranslateClustersAndMirrors = [
-                       'eqiad' => [ 'codfw' ],
-                       'codfw' => [ 'eqiad' ],
+                       'eqiad' => isset ( $wmfAllServices['codfw']['search'] ) 
? [ 'codfw' ] : [],
+                       'codfw' => isset ( $wmfAllServices['eqiad']['search'] ) 
? [ 'eqiad' ] : [],
                ];
                foreach ( $wgTranslateClustersAndMirrors as $cluster => 
$mirrors ) {
                        if ( !isset( $wmfAllServices[$cluster]['search'] ) ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I73f1db96abceaf3eb08fb946d4e3f5213d657069
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: DCausse <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Urbanecm <[email protected]>
Gerrit-Reviewer: Zoranzoki21 <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to