jenkins-bot has submitted this change and it was merged.
Change subject: Bumped file journal ttl to a year and avoided some duplication.
......................................................................
Bumped file journal ttl to a year and avoided some duplication.
Change-Id: I843969b9c88dc58b23b1277ba0ea79fbf61f6b59
---
M wmf-config/filebackend.php
1 file changed, 8 insertions(+), 6 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/filebackend.php b/wmf-config/filebackend.php
index 4b718c1..5dbc429 100644
--- a/wmf-config/filebackend.php
+++ b/wmf-config/filebackend.php
@@ -6,6 +6,8 @@
# This file hold the configuration for the file backends
# for production.
+$wmfFileJournalTTL = 365; // days
+
/* OpenStack Swift backend config */
$wmfSwiftBigWikis = array( # DO NOT change without proper migration first
'commonswiki', 'dewiki', 'enwiki', 'fiwiki', 'frwiki', 'hewiki',
'huwiki', 'idwiki',
@@ -18,7 +20,7 @@
'name' => 'local-swift',
'wikiId' => "{$site}-{$lang}",
'lockManager' => 'nullLockManager', // LocalFile uses FOR UPDATE
- 'fileJournal' => array( 'class' => 'DBFileJournal', 'wiki' =>
$wgDBname, 'ttlDays' => 240 ),
+ 'fileJournal' => array( 'class' => 'DBFileJournal', 'wiki' =>
$wgDBname, 'ttlDays' => $wmfFileJournalTTL ),
'swiftAuthUrl' => $wmfSwiftConfig['authUrl'],
'swiftUser' => $wmfSwiftConfig['user'],
'swiftKey' => $wmfSwiftConfig['key'],
@@ -38,7 +40,7 @@
'name' => 'shared-swift',
'wikiId' => "wikipedia-commons",
'lockManager' => 'nullLockManager', // just thumbnails
- 'fileJournal' => array( 'class' => 'DBFileJournal', 'wiki' =>
'commonswiki', 'ttlDays' => 240 ),
+ 'fileJournal' => array( 'class' => 'DBFileJournal', 'wiki' =>
'commonswiki', 'ttlDays' => $wmfFileJournalTTL ),
'swiftAuthUrl' => $wmfSwiftConfig['authUrl'],
'swiftUser' => $wmfSwiftConfig['user'],
'swiftKey' => $wmfSwiftConfig['key'],
@@ -75,7 +77,7 @@
'name' => 'local-ceph',
'wikiId' => "{$site}-{$lang}",
'lockManager' => 'nullLockManager', // LocalFile uses FOR UPDATE
- 'fileJournal' => array( 'class' => 'DBFileJournal', 'wiki' =>
$wgDBname, 'ttlDays' => 240 ),
+ 'fileJournal' => array( 'class' => 'DBFileJournal', 'wiki' =>
$wgDBname, 'ttlDays' => $wmfFileJournalTTL ),
'swiftAuthUrl' => $wmfCephRgwConfig['authUrl'],
'swiftUser' => $wmfCephRgwConfig['user'],
'swiftKey' => $wmfCephRgwConfig['key'],
@@ -97,7 +99,7 @@
'name' => 'shared-ceph',
'wikiId' => "wikipedia-commons",
'lockManager' => 'nullLockManager', // just thumbnails
- 'fileJournal' => array( 'class' => 'DBFileJournal', 'wiki' =>
'commonswiki', 'ttlDays' => 240 ),
+ 'fileJournal' => array( 'class' => 'DBFileJournal', 'wiki' =>
'commonswiki', 'ttlDays' => $wmfFileJournalTTL ),
'swiftAuthUrl' => $wmfCephRgwConfig['authUrl'],
'swiftUser' => $wmfCephRgwConfig['user'],
'swiftKey' => $wmfCephRgwConfig['key'],
@@ -138,7 +140,7 @@
'name' => 'local-multiwrite',
'wikiId' => "{$site}-{$lang}",
'lockManager' => 'nullLockManager', # LocalFile uses FOR UPDATE
- 'fileJournal' => array( 'class' => 'DBFileJournal', 'wiki' =>
$wgDBname, 'ttlDays' => 240 ),
+ 'fileJournal' => array( 'class' => 'DBFileJournal', 'wiki' =>
$wgDBname, 'ttlDays' => $wmfFileJournalTTL ),
'backends' => array(
array( 'template' => 'local-swift', 'isMultiMaster' => true )
),
@@ -150,7 +152,7 @@
'name' => 'shared-multiwrite',
'wikiId' => "wikipedia-commons",
'lockManager' => 'nullLockManager', // just thumbnails
- 'fileJournal' => array( 'class' => 'DBFileJournal', 'wiki' =>
'commonswiki', 'ttlDays' => 240 ),
+ 'fileJournal' => array( 'class' => 'DBFileJournal', 'wiki' =>
'commonswiki', 'ttlDays' => $wmfFileJournalTTL ),
'backends' => array(
array( 'template' => 'shared-swift', 'isMultiMaster' => true ),
),
--
To view, visit https://gerrit.wikimedia.org/r/58213
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I843969b9c88dc58b23b1277ba0ea79fbf61f6b59
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
