[MediaWiki-commits] [Gerrit] Enable async swift writes for remaining backends - change (operations/mediawiki-config)

2016-03-08 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Enable async swift writes for remaining backends
..


Enable async swift writes for remaining backends

Change-Id: Iddadc326539f5c0bc50857e45fc4527e84ca
---
M wmf-config/filebackend-production.php
1 file changed, 6 insertions(+), 8 deletions(-)

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



diff --git a/wmf-config/filebackend-production.php 
b/wmf-config/filebackend-production.php
index 2a3349d..5fdc59e 100644
--- a/wmf-config/filebackend-production.php
+++ b/wmf-config/filebackend-production.php
@@ -92,12 +92,10 @@
'wikiId'  => "{$site}-{$lang}",
'lockManager' => 'redisLockManager',
# DO NOT change the master backend unless it is fully trusted or 
autoRsync is off
-   'backends'=> ( $wgDBname === 'commonswiki' )
-   ? array( array( 'template' => 'local-swift-eqiad', 
'isMultiMaster' => true ) )
-   : array(
-   array( 'template' => 'local-swift-eqiad', 
'isMultiMaster' => true ),
-   array( 'template' => 'local-swift-codfw' )
-   ),
+   'backends'=> array(
+   array( 'template' => 'local-swift-eqiad', 'isMultiMaster' => 
true ),
+   array( 'template' => 'local-swift-codfw' )
+   ),
'replication' => 'async',
'syncChecks'  => ( 1 | 4 ), // (size & sha1)
 );
@@ -109,7 +107,7 @@
# DO NOT change the master backend unless it is fully trusted or 
autoRsync is off
'backends'=> array(
array( 'template' => 'shared-swift-eqiad', 'isMultiMaster' => 
true ),
-   #array( 'template' => 'shared-swift-codfw' ),
+   array( 'template' => 'shared-swift-codfw' ),
),
'replication' => 'async',
'syncChecks'  => ( 1 | 4 ), // (size & sha1)
@@ -119,8 +117,8 @@
'name'=> 'global-multiwrite',
'wikiId'  => "global-data",
'lockManager' => 'redisLockManager',
+   # DO NOT change the master backend unless it is fully trusted or 
autoRsync is off
'backends'=> array(
-   # DO NOT change the master backend unless it is fully trusted 
or autoRsync is off
array( 'template' => 'global-swift-eqiad', 'isMultiMaster' => 
true ),
array( 'template' => 'global-swift-codfw' ),
),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iddadc326539f5c0bc50857e45fc4527e84ca
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Gilles 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] Enable async swift writes for remaining backends - change (operations/mediawiki-config)

2016-02-23 Thread Aaron Schulz (Code Review)
Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/272922

Change subject: Enable async swift writes for remaining backends
..

Enable async swift writes for remaining backends

Change-Id: Iddadc326539f5c0bc50857e45fc4527e84ca
---
M wmf-config/filebackend-production.php
1 file changed, 6 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/22/272922/1

diff --git a/wmf-config/filebackend-production.php 
b/wmf-config/filebackend-production.php
index 2af5f37..726431d 100644
--- a/wmf-config/filebackend-production.php
+++ b/wmf-config/filebackend-production.php
@@ -92,12 +92,10 @@
'wikiId'  => "{$site}-{$lang}",
'lockManager' => 'redisLockManager',
# DO NOT change the master backend unless it is fully trusted or 
autoRsync is off
-   'backends'=> in_array( $wgDBname, $wmfSwiftBigWikis )
-   ? array( array( 'template' => 'local-swift-eqiad', 
'isMultiMaster' => true ) )
-   : array(
-   array( 'template' => 'local-swift-eqiad', 
'isMultiMaster' => true ),
-   array( 'template' => 'local-swift-codfw' )
-   ),
+   'backends'=> array(
+   array( 'template' => 'local-swift-eqiad', 'isMultiMaster' => 
true ),
+   array( 'template' => 'local-swift-codfw' )
+   ),
'replication' => 'async',
'syncChecks'  => ( 1 | 4 ), // (size & sha1)
 );
@@ -109,7 +107,7 @@
# DO NOT change the master backend unless it is fully trusted or 
autoRsync is off
'backends'=> array(
array( 'template' => 'shared-swift-eqiad', 'isMultiMaster' => 
true ),
-   #array( 'template' => 'shared-swift-codfw' ),
+   array( 'template' => 'shared-swift-codfw' ),
),
'replication' => 'async',
'syncChecks'  => ( 1 | 4 ), // (size & sha1)
@@ -119,8 +117,8 @@
'name'=> 'global-multiwrite',
'wikiId'  => "global-data",
'lockManager' => 'redisLockManager',
+   # DO NOT change the master backend unless it is fully trusted or 
autoRsync is off
'backends'=> array(
-   # DO NOT change the master backend unless it is fully trusted 
or autoRsync is off
array( 'template' => 'global-swift-eqiad', 'isMultiMaster' => 
true ),
array( 'template' => 'global-swift-codfw' ),
),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iddadc326539f5c0bc50857e45fc4527e84ca
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits