jenkins-bot has submitted this change and it was merged.
Change subject: Revert "Restructure $wmfSwiftEqiadConfig into $wmfSwiftConfig"
......................................................................
Revert "Restructure $wmfSwiftEqiadConfig into $wmfSwiftConfig"
This reverts commit 9012cf84ec4909b9f243866ac247909db8e674ac.
Should solve T91761
Change-Id: Icfabe0b1befe54c1eccd012624898af792f42a74
---
M wmf-config/CirrusSearch-production.php
M wmf-config/filebackend.php
2 files changed, 16 insertions(+), 16 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CirrusSearch-production.php
b/wmf-config/CirrusSearch-production.php
index eabec28..4fbdf8c 100644
--- a/wmf-config/CirrusSearch-production.php
+++ b/wmf-config/CirrusSearch-production.php
@@ -13,10 +13,10 @@
$wgCirrusSearchBackup['backups'] = array(
'type' => 'swift',
- 'swift_url' => $wmfSwiftConfig[$wmfDatacenter]['cirrusAuthUrl'],
+ 'swift_url' => $wmfSwiftEqiadConfig['cirrusAuthUrl'],
'swift_container' => 'global-data-elastic-backups',
- 'swift_username' => $wmfSwiftConfig[$wmfDatacenter]['cirrusUser'],
- 'swift_password' => $wmfSwiftConfig[$wmfDatacenter]['cirrusKey'],
+ 'swift_username' => $wmfSwiftEqiadConfig['cirrusUser'],
+ 'swift_password' => $wmfSwiftEqiadConfig['cirrusKey'],
'max_snapshot_bytes_per_sec' => '10mb',
'compress' => false,
'chunk_size' => '1g',
diff --git a/wmf-config/filebackend.php b/wmf-config/filebackend.php
index c4f9fc1..67129ad 100644
--- a/wmf-config/filebackend.php
+++ b/wmf-config/filebackend.php
@@ -15,16 +15,16 @@
$wmfSwiftShardCommon = in_array( 'commonswiki', $wmfSwiftBigWikis ) ? 2 : 0;
// shard levels
/* end common Swift config */
-/* Swift backend config */
+/* Eqiad Swift backend config */
$wgFileBackends[] = array( // backend config for wiki's local repo
'class' => 'SwiftFileBackend',
'name' => 'local-swift-eqiad',
'wikiId' => "{$site}-{$lang}",
'lockManager' => 'redisLockManager',
- 'swiftAuthUrl' => $wmfSwiftConfig[$wmfDatacenter]['authUrl'],
- 'swiftUser' => $wmfSwiftConfig[$wmfDatacenter]['user'],
- 'swiftKey' => $wmfSwiftConfig[$wmfDatacenter]['key'],
- 'swiftTempUrlKey' => $wmfSwiftConfig[$wmfDatacenter]['tempUrlKey'],
+ 'swiftAuthUrl' => $wmfSwiftEqiadConfig['authUrl'],
+ 'swiftUser' => $wmfSwiftEqiadConfig['user'],
+ 'swiftKey' => $wmfSwiftEqiadConfig['key'],
+ 'swiftTempUrlKey' => $wmfSwiftEqiadConfig['tempUrlKey'],
'shardViaHashLevels' => array(
'local-public' => array( 'levels' => $wmfSwiftShardLocal,
'base' => 16, 'repeat' => 1 ),
'local-thumb' => array( 'levels' => $wmfSwiftShardLocal,
'base' => 16, 'repeat' => 1 ),
@@ -40,10 +40,10 @@
'name' => 'shared-swift-eqiad',
'wikiId' => "wikipedia-commons",
'lockManager' => 'redisLockManager',
- 'swiftAuthUrl' => $wmfSwiftConfig[$wmfDatacenter]['authUrl'],
- 'swiftUser' => $wmfSwiftConfig[$wmfDatacenter]['user'],
- 'swiftKey' => $wmfSwiftConfig[$wmfDatacenter]['key'],
- 'swiftTempUrlKey' => $wmfSwiftConfig[$wmfDatacenter]['tempUrlKey'],
+ 'swiftAuthUrl' => $wmfSwiftEqiadConfig['authUrl'],
+ 'swiftUser' => $wmfSwiftEqiadConfig['user'],
+ 'swiftKey' => $wmfSwiftEqiadConfig['key'],
+ 'swiftTempUrlKey' => $wmfSwiftEqiadConfig['tempUrlKey'],
'shardViaHashLevels' => array(
'local-public' => array( 'levels' => $wmfSwiftShardCommon,
'base' => 16, 'repeat' => 1 ),
'local-thumb' => array( 'levels' => $wmfSwiftShardCommon,
'base' => 16, 'repeat' => 1 ),
@@ -58,10 +58,10 @@
'name' => 'global-swift-eqiad',
'wikiId' => "global-data",
'lockManager' => 'redisLockManager',
- 'swiftAuthUrl' => $wmfSwiftConfig[$wmfDatacenter]['authUrl'],
- 'swiftUser' => $wmfSwiftConfig[$wmfDatacenter]['user'],
- 'swiftKey' => $wmfSwiftConfig[$wmfDatacenter]['key'],
- 'swiftTempUrlKey' => $wmfSwiftConfig[$wmfDatacenter]['tempUrlKey'],
+ 'swiftAuthUrl' => $wmfSwiftEqiadConfig['authUrl'],
+ 'swiftUser' => $wmfSwiftEqiadConfig['user'],
+ 'swiftKey' => $wmfSwiftEqiadConfig['key'],
+ 'swiftTempUrlKey' => $wmfSwiftEqiadConfig['tempUrlKey'],
'shardViaHashLevels' => array(
'math-render' => array( 'levels' => 2, 'base' => 16, 'repeat'
=> 0 ),
),
--
To view, visit https://gerrit.wikimedia.org/r/194886
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icfabe0b1befe54c1eccd012624898af792f42a74
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
