[MediaWiki-commits] [Gerrit] Enable deferred writes to codfw swift cluster - change (operations/mediawiki-config)

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

Change subject: Enable deferred writes to codfw swift cluster
..


Enable deferred writes to codfw swift cluster

* Limited to the "global" backend (math/score/captcha) for now
* Writes go to eqiad first, codfw async
* Reads go to the local swift cluster
* Reads-for-writes go to eqiad, however
* autosync is off since swiftrepl handles any cleanup

Bug: T91869
Change-Id: I83db83dc5d95c6bd14f1f22e93feae6468d54ff5
---
M wmf-config/filebackend-production.php
1 file changed, 16 insertions(+), 7 deletions(-)

Approvals:
  Filippo Giunchedi: Looks good to me, but someone else must approve
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/filebackend-production.php 
b/wmf-config/filebackend-production.php
index 9e43842..4c81226 100644
--- a/wmf-config/filebackend-production.php
+++ b/wmf-config/filebackend-production.php
@@ -37,7 +37,9 @@
=> array( 'levels' => $wmfSwiftShardLocal, 
'base' => 36, 'repeat' => 0 )
),
'parallelize'=> 'implicit',
-   'cacheAuthInfo'  => true
+   'cacheAuthInfo'  => true,
+   // When used by FileBackendMultiWrite, read from this cluster 
if it's the local one
+   'readAffinity'   => ( $specificDC === $wmfDatacenter )
);
$wgFileBackends[] = array( // backend config for wiki's access to 
shared repo
'class'  => 'SwiftFileBackend',
@@ -59,7 +61,9 @@
=> array( 'levels' => $wmfSwiftShardCommon, 
'base' => 16, 'repeat' => 1 ),
),
'parallelize'=> 'implicit',
-   'cacheAuthInfo'  => true
+   'cacheAuthInfo'  => true,
+   // When used by FileBackendMultiWrite, read from this cluster 
if it's the local one
+   'readAffinity'   => ( $specificDC === $wmfDatacenter )
);
$wgFileBackends[] = array( // backend config for wiki's access to 
shared files
'class'  => 'SwiftFileBackend',
@@ -74,7 +78,9 @@
'math-render'  => array( 'levels' => 2, 'base' => 16, 
'repeat' => 0 ),
),
'parallelize'=> 'implicit',
-   'cacheAuthInfo'  => true
+   'cacheAuthInfo'  => true,
+   // When used by FileBackendMultiWrite, read from this cluster 
if it's the local one
+   'readAffinity'   => ( $specificDC === $wmfDatacenter )
);
 }
 /* end DC-specific Swift backend config */
@@ -88,9 +94,10 @@
'backends'=> array(
# DO NOT change the master backend unless it is fully trusted 
or autoRsync is off
array( 'template' => 'local-swift-eqiad', 'isMultiMaster' => 
true ),
+   #array( 'template' => 'local-swift-codfw' ),
),
+   'replication' => 'async',
'syncChecks'  => ( 1 | 4 ), // (size & sha1)
-   'autoResync'  => 'conservative' // T41221
 );
 $wgFileBackends[] = array(
'class'   => 'FileBackendMultiWrite',
@@ -100,9 +107,10 @@
'backends'=> array(
# DO NOT change the master backend unless it is fully trusted 
or autoRsync is off
array( 'template' => 'shared-swift-eqiad', 'isMultiMaster' => 
true ),
+   #array( 'template' => 'shared-swift-codfw' ),
),
+   'replication' => 'async',
'syncChecks'  => ( 1 | 4 ), // (size & sha1)
-   'autoResync'  => 'conservative' // T41221
 );
 $wgFileBackends[] = array(
'class'   => 'FileBackendMultiWrite',
@@ -112,9 +120,10 @@
'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' ),
),
-   'syncChecks'  => ( 1 | 4 ), // (size & sha1)
-   'autoResync'  => 'conservative'
+   'replication' => 'async',
+   'syncChecks'  => ( 1 | 4 ) // (size & sha1)
 );
 /* end multiwrite backend config */
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I83db83dc5d95c6bd14f1f22e93feae6468d54ff5
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Florianschmidtwelzow

[MediaWiki-commits] [Gerrit] Enable deferred writes to codfw swift cluster - change (operations/mediawiki-config)

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

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

Change subject: Enable deferred writes to codfw swift cluster
..

Enable deferred writes to codfw swift cluster

* Writes go to eqiad first, codfw async
* Reads go to the local swift cluster
* Reads-for-writes go to eqiad, however

Bug: T91869
Change-Id: I83db83dc5d95c6bd14f1f22e93feae6468d54ff5
---
M wmf-config/filebackend-production.php
1 file changed, 15 insertions(+), 3 deletions(-)


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

diff --git a/wmf-config/filebackend-production.php 
b/wmf-config/filebackend-production.php
index 9e43842..be0ec62 100644
--- a/wmf-config/filebackend-production.php
+++ b/wmf-config/filebackend-production.php
@@ -37,7 +37,9 @@
=> array( 'levels' => $wmfSwiftShardLocal, 
'base' => 36, 'repeat' => 0 )
),
'parallelize'=> 'implicit',
-   'cacheAuthInfo'  => true
+   'cacheAuthInfo'  => true,
+   // When used by FileBackendMultiWrite, read from this cluster 
if it's the local one
+   'readAffinity'   => ( $specificDC === $wmfDatacenter )
);
$wgFileBackends[] = array( // backend config for wiki's access to 
shared repo
'class'  => 'SwiftFileBackend',
@@ -59,7 +61,9 @@
=> array( 'levels' => $wmfSwiftShardCommon, 
'base' => 16, 'repeat' => 1 ),
),
'parallelize'=> 'implicit',
-   'cacheAuthInfo'  => true
+   'cacheAuthInfo'  => true,
+   // When used by FileBackendMultiWrite, read from this cluster 
if it's the local one
+   'readAffinity'   => ( $specificDC === $wmfDatacenter )
);
$wgFileBackends[] = array( // backend config for wiki's access to 
shared files
'class'  => 'SwiftFileBackend',
@@ -74,7 +78,9 @@
'math-render'  => array( 'levels' => 2, 'base' => 16, 
'repeat' => 0 ),
),
'parallelize'=> 'implicit',
-   'cacheAuthInfo'  => true
+   'cacheAuthInfo'  => true,
+   // When used by FileBackendMultiWrite, read from this cluster 
if it's the local one
+   'readAffinity'   => ( $specificDC === $wmfDatacenter )
);
 }
 /* end DC-specific Swift backend config */
@@ -88,7 +94,9 @@
'backends'=> array(
# DO NOT change the master backend unless it is fully trusted 
or autoRsync is off
array( 'template' => 'local-swift-eqiad', 'isMultiMaster' => 
true ),
+   array( 'template' => 'local-swift-codfw' ),
),
+   'replication' => 'async',
'syncChecks'  => ( 1 | 4 ), // (size & sha1)
'autoResync'  => 'conservative' // T41221
 );
@@ -100,7 +108,9 @@
'backends'=> array(
# DO NOT change the master backend unless it is fully trusted 
or autoRsync is off
array( 'template' => 'shared-swift-eqiad', 'isMultiMaster' => 
true ),
+   array( 'template' => 'shared-swift-codfw' ),
),
+   'replication' => 'async',
'syncChecks'  => ( 1 | 4 ), // (size & sha1)
'autoResync'  => 'conservative' // T41221
 );
@@ -112,7 +122,9 @@
'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' ),
),
+   'replication' => 'async',
'syncChecks'  => ( 1 | 4 ), // (size & sha1)
'autoResync'  => 'conservative'
 );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I83db83dc5d95c6bd14f1f22e93feae6468d54ff5
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