Faidon has submitted this change and it was merged.
Change subject: Revert "filebackend: switch master to Ceph"
......................................................................
Revert "filebackend: switch master to Ceph"
This reverts commit c0dba46b3218d2c695aba8a0d75e96ef98de6f82.
Change-Id: I1c32880fb124502b251cbf8f1b0366edc310a696
---
M wmf-config/filebackend.php
1 file changed, 6 insertions(+), 6 deletions(-)
Approvals:
Faidon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/filebackend.php b/wmf-config/filebackend.php
index 7de2d48..4ba64b2 100644
--- a/wmf-config/filebackend.php
+++ b/wmf-config/filebackend.php
@@ -143,8 +143,8 @@
'fileJournal' => array( 'class' => 'DBFileJournal', 'wiki' =>
$wgDBname, 'ttlDays' => $wmfFileJournalTTL ),
'backends' => array(
# DO NOT change the master backend unless it is fully trusted
or autoRsync is off
- array( 'template' => 'local-swift', 'isMultiMaster' => false ),
- array( 'template' => 'local-ceph', 'isMultiMaster' => true )
+ array( 'template' => 'local-swift', 'isMultiMaster' => true ),
+ array( 'template' => 'local-ceph', 'isMultiMaster' => false )
),
'syncChecks' => ( 1 | 4 ), // (size & sha1)
'autoResync' => 'conservative' // bug 39221
@@ -157,8 +157,8 @@
'fileJournal' => array( 'class' => 'DBFileJournal', 'wiki' =>
'commonswiki', 'ttlDays' => $wmfFileJournalTTL ),
'backends' => array(
# DO NOT change the master backend unless it is fully trusted
or autoRsync is off
- array( 'template' => 'shared-swift', 'isMultiMaster' => false ),
- array( 'template' => 'shared-ceph', 'isMultiMaster' => true )
+ array( 'template' => 'shared-swift', 'isMultiMaster' => true ),
+ array( 'template' => 'shared-ceph', 'isMultiMaster' => false )
),
'syncChecks' => ( 1 | 4 ), // (size & sha1)
'autoResync' => 'conservative' // bug 39221
@@ -170,8 +170,8 @@
'lockManager' => 'nullLockManager',
'backends' => array(
# DO NOT change the master backend unless it is fully trusted
or autoRsync is off
- array( 'template' => 'global-swift', 'isMultiMaster' => false ),
- array( 'template' => 'global-ceph', 'isMultiMaster' => true )
+ array( 'template' => 'global-swift', 'isMultiMaster' => true ),
+ array( 'template' => 'global-ceph', 'isMultiMaster' => false )
),
'syncChecks' => ( 1 | 4 ), // (size & sha1)
'autoResync' => 'conservative'
--
To view, visit https://gerrit.wikimedia.org/r/80221
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1c32880fb124502b251cbf8f1b0366edc310a696
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Faidon <[email protected]>
Gerrit-Reviewer: Faidon <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
