Jcrespo has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/366839 )
Change subject: Move some trailing ] onto newlines to make more balanced
......................................................................
Move some trailing ] onto newlines to make more balanced
Change-Id: Id4f7920fb0d811a3281ca3fd4cfa6bc7db06b255
---
M wmf-config/db-codfw.php
M wmf-config/db-eqiad.php
2 files changed, 28 insertions(+), 14 deletions(-)
Approvals:
Krinkle: Looks good to me, but someone else must approve
jenkins-bot: Verified
Jcrespo: Looks good to me, approved
diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index b59742b..0e695ae 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -175,43 +175,50 @@
's1' => [
'lagDetectionMethod' => 'pt-heartbeat',
'lagDetectionOptions' => [
- 'conds' => [ 'shard' => 's1', 'datacenter' =>
$wmfMasterDatacenter ] ],
+ 'conds' => [ 'shard' => 's1', 'datacenter' =>
$wmfMasterDatacenter ]
+ ],
'useGTIDs' => true
],
's2' => [
'lagDetectionMethod' => 'pt-heartbeat',
'lagDetectionOptions' => [
- 'conds' => [ 'shard' => 's2', 'datacenter' =>
$wmfMasterDatacenter ] ],
+ 'conds' => [ 'shard' => 's2', 'datacenter' =>
$wmfMasterDatacenter ]
+ ],
'useGTIDs' => true
],
'DEFAULT' /* s3 */ => [
'lagDetectionMethod' => 'pt-heartbeat',
'lagDetectionOptions' => [
- 'conds' => [ 'shard' => 's3', 'datacenter' =>
$wmfMasterDatacenter ] ],
+ 'conds' => [ 'shard' => 's3', 'datacenter' =>
$wmfMasterDatacenter ]
+ ],
'useGTIDs' => true
],
's4' => [
'lagDetectionMethod' => 'pt-heartbeat',
'lagDetectionOptions' => [
- 'conds' => [ 'shard' => 's4', 'datacenter' =>
$wmfMasterDatacenter ] ],
+ 'conds' => [ 'shard' => 's4', 'datacenter' =>
$wmfMasterDatacenter ]
+ ],
'useGTIDs' => true
],
's5' => [
'lagDetectionMethod' => 'pt-heartbeat',
'lagDetectionOptions' => [
- 'conds' => [ 'shard' => 's5', 'datacenter' =>
$wmfMasterDatacenter ] ],
+ 'conds' => [ 'shard' => 's5', 'datacenter' =>
$wmfMasterDatacenter ]
+ ],
'useGTIDs' => true
],
's6' => [
'lagDetectionMethod' => 'pt-heartbeat',
'lagDetectionOptions' => [
- 'conds' => [ 'shard' => 's6', 'datacenter' =>
$wmfMasterDatacenter ] ],
+ 'conds' => [ 'shard' => 's6', 'datacenter' =>
$wmfMasterDatacenter ]
+ ],
'useGTIDs' => true
],
's7' => [
'lagDetectionMethod' => 'pt-heartbeat',
'lagDetectionOptions' => [
- 'conds' => [ 'shard' => 's7', 'datacenter' =>
$wmfMasterDatacenter ] ],
+ 'conds' => [ 'shard' => 's7', 'datacenter' =>
$wmfMasterDatacenter ]
+ ],
'useGTIDs' => true
],
],
diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index c3dc19c..ce1b2d5 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -190,43 +190,50 @@
's1' => [
'lagDetectionMethod' => 'pt-heartbeat',
'lagDetectionOptions' => [
- 'conds' => [ 'shard' => 's1', 'datacenter' =>
$wmfMasterDatacenter ] ],
+ 'conds' => [ 'shard' => 's1', 'datacenter' =>
$wmfMasterDatacenter ]
+ ],
'useGTIDs' => true
],
's2' => [
'lagDetectionMethod' => 'pt-heartbeat',
'lagDetectionOptions' => [
- 'conds' => [ 'shard' => 's2', 'datacenter' =>
$wmfMasterDatacenter ] ],
+ 'conds' => [ 'shard' => 's2', 'datacenter' =>
$wmfMasterDatacenter ]
+ ],
'useGTIDs' => true
],
'DEFAULT' /* s3 */ => [
'lagDetectionMethod' => 'pt-heartbeat',
'lagDetectionOptions' => [
- 'conds' => [ 'shard' => 's3', 'datacenter' =>
$wmfMasterDatacenter ] ],
+ 'conds' => [ 'shard' => 's3', 'datacenter' =>
$wmfMasterDatacenter ]
+ ],
'useGTIDs' => true
],
's4' => [
'lagDetectionMethod' => 'pt-heartbeat',
'lagDetectionOptions' => [
- 'conds' => [ 'shard' => 's4', 'datacenter' =>
$wmfMasterDatacenter ] ],
+ 'conds' => [ 'shard' => 's4', 'datacenter' =>
$wmfMasterDatacenter ]
+ ],
'useGTIDs' => true
],
's5' => [
'lagDetectionMethod' => 'pt-heartbeat',
'lagDetectionOptions' => [
- 'conds' => [ 'shard' => 's5', 'datacenter' =>
$wmfMasterDatacenter ] ],
+ 'conds' => [ 'shard' => 's5', 'datacenter' =>
$wmfMasterDatacenter ]
+ ],
'useGTIDs' => true
],
's6' => [
'lagDetectionMethod' => 'pt-heartbeat',
'lagDetectionOptions' => [
- 'conds' => [ 'shard' => 's6', 'datacenter' =>
$wmfMasterDatacenter ] ],
+ 'conds' => [ 'shard' => 's6', 'datacenter' =>
$wmfMasterDatacenter ]
+ ],
'useGTIDs' => true
],
's7' => [
'lagDetectionMethod' => 'pt-heartbeat',
'lagDetectionOptions' => [
- 'conds' => [ 'shard' => 's7', 'datacenter' =>
$wmfMasterDatacenter ] ],
+ 'conds' => [ 'shard' => 's7', 'datacenter' =>
$wmfMasterDatacenter ]
+ ],
'useGTIDs' => true
],
],
--
To view, visit https://gerrit.wikimedia.org/r/366839
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id4f7920fb0d811a3281ca3fd4cfa6bc7db06b255
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com>
Gerrit-Reviewer: Jcrespo <jcre...@wikimedia.org>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
