jenkins-bot has submitted this change and it was merged.
Change subject: Split Wikibase's entity cache for HHVM/Zend
......................................................................
Split Wikibase's entity cache for HHVM/Zend
Bug: 71461
Change-Id: I197651871c3d68423980979603276b03f1dd64c0
---
M wmf-config/InitialiseSettings.php
M wmf-config/Wikibase.php
2 files changed, 12 insertions(+), 19 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index dfc35c9..4eab852 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -13492,9 +13492,9 @@
'wmgWikibaseCachePrefix' => array(
'default' => 'wikidatawiki',
- 'testwikidatawiki' => 'testwikidatawiki',
- 'test2wiki' => 'testwikidatawiki',
- 'testwiki' => 'testwikidatawiki'
+ 'testwikidatawiki' => 'testwikidatawiki0',
+ 'test2wiki' => 'testwikidatawiki0',
+ 'testwiki' => 'testwikidatawiki0'
),
'wmgWikibaseEnableData' => array(
diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php
index a36a2b3..590a176 100644
--- a/wmf-config/Wikibase.php
+++ b/wmf-config/Wikibase.php
@@ -2,6 +2,13 @@
require_once( "$IP/extensions/Wikidata/Wikidata.php" );
+$wgWBSharedCacheKeyPrefix = "$wmgWikibaseCachePrefix/WBL-$wmfVersionNumber";
+
+if ( defined( 'HHVM_VERSION' ) ) {
+ // Split the cache up for hhvm. Bug 71461
+ $wgWBSharedCacheKeyPrefix .= '-hhvm';
+}
+
if ( $wmgUseWikibaseRepo ) {
$baseNs = 120;
@@ -80,14 +87,7 @@
$wgWBRepoSettings['dataSquidMaxage'] = 1 * 60 * 60;
$wgWBRepoSettings['sharedCacheDuration'] = 60 * 60 * 24;
-
- if ( $wmfVersionNumber === '1.24wmf21' ) {
- // temp hack to refresh cache for any broken things on
test.wikidata / test2
- // due to broken code deployed to 1.24wmf21. set here and for
client.
- $wgWBRepoSettings['sharedCacheKeyPrefix'] =
"$wmgWikibaseCachePrefix/WBL-1.24wmf21b";
- } else {
- $wgWBRepoSettings['sharedCacheKeyPrefix'] =
"$wmgWikibaseCachePrefix/WBL-$wmfVersionNumber";
- }
+ $wgWBRepoSettings['sharedCacheKeyPrefix'] = $wgWBSharedCacheKeyPrefix;
$wgPropertySuggesterMinProbability = 0.071;
@@ -192,13 +192,6 @@
$wgWBClientSettings['allowDataTransclusion'] = $wmgWikibaseEnableData;
- if ( $wmfVersionNumber === '1.24wmf21' ) {
- // temp hack to refresh cache for any broken things on
test.wikidata / test2
- // due to broken code deployed to 1.24wmf21. set here and for
repo.
- $wgWBClientSettings['sharedCacheKeyPrefix'] =
"$wmgWikibaseCachePrefix/WBL-1.24wmf21b";
- } else {
- $wgWBClientSettings['sharedCacheKeyPrefix'] =
"$wmgWikibaseCachePrefix/WBL-$wmfVersionNumber";
- }
-
+ $wgWBClientSettings['sharedCacheKeyPrefix'] = $wgWBSharedCacheKeyPrefix;
$wgWBClientSettings['sharedCacheDuration'] = 60 * 60 * 24;
}
--
To view, visit https://gerrit.wikimedia.org/r/163842
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I197651871c3d68423980979603276b03f1dd64c0
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hoo man <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
