Skip to content

Commit 76b0b75

Browse files
addshoreaddshore
committed
l10ncache on both wikis, fix settings, try cache dir..
1 parent 46d8f0c commit 76b0b75

File tree

8 files changed

+43
-17
lines changed

8 files changed

+43
-17
lines changed

‎.github/workflows/test.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ jobs:
2929
# - default
3030
- lightweight
3131
- lightweight-wbNoSharedCache
32+
- lightweight-mwCacheDirectory
33+
# - mwCacheDirectory
3234
# - mwNoJobs
3335
# - wbNoChangesTable
3436
# - wbNewTerms
@@ -43,10 +45,10 @@ jobs:
4345
- name: Checkout code
4446
uses: actions/checkout@v2
4547
- name: Run containers
46-
run: PROFILE_SETTINGS=${{ matrix.settings }} PROFILE_IMAGE=${{ matrix.images }} PROFILE_SQL=${{ matrix.sql }} docker-compose up -d
47-
- name: Wait for setup
4848
run: |
49+
PROFILE_SETTINGS=${{ matrix.settings }} PROFILE_IMAGE=${{ matrix.images }} PROFILE_SQL=${{ matrix.sql }} docker-compose up -d mysql wikibase1
4950
./docker-compose-wait1.sh
51+
PROFILE_SETTINGS=${{ matrix.settings }} PROFILE_IMAGE=${{ matrix.images }} PROFILE_SQL=${{ matrix.sql }} docker-compose up -d wikibase2
5052
./docker-compose-wait2.sh
5153
sleep 5
5254
- name: Perform test

‎LocalSettings.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,6 @@
9393
## localise the wiki.
9494
$wgShellLocale = "C.UTF-8";
9595

96-
## Set $wgCacheDirectory to a writable directory on the web server
97-
## to make your wiki go slightly faster. The directory should not
98-
## be publicly accessible from the web.
99-
#$wgCacheDirectory = "$IP/cache";
100-
10196
# Site language code, should be one of the list in ./languages/data/Names.php
10297
$wgLanguageCode = "en";
10398

‎docker-compose-entry1.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ if [ ! -f entrypoint-done.txt ]; then
2727
# Update MediaWiki & Extensions
2828
php maintenance/update.php --quick
2929

30+
# Run extra entry point stuff for this test (such as config changes)
31+
/code-settings.sh
32+
3033
# Build the localisation cache ahead of makinng bulk requests (as building it can cause issues)
3134
php maintenance/rebuildLocalisationCache.php --lang en
3235
# And disable any recaching on web requests
3336
echo "\$wgLocalisationCacheConf['manualRecache'] = true;" >> LocalSettings.php
3437

35-
# Run extra entry point stuff for this test (such as config changes)
36-
/code-settings.sh
37-
3838
# Mark the entrypoint as having run!
3939
echo "entrypoint done!" > entrypoint-done.txt
4040

‎docker-compose-entry2.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ if [ ! -f entrypoint-done.txt ]; then
3030
# Update MediaWiki & Extensions
3131
#php maintenance/update.php --quick
3232

33-
# Build the localisation cache ahead of makinng bulk requests (as building it can cause issues)
34-
#php maintenance/rebuildLocalisationCache.php --lang en
35-
# And disable any recaching on web requests
36-
#echo "\$wgLocalisationCacheConf['manualRecache'] = true;" >> LocalSettings.php
37-
3833
# Run extra entry point stuff for this test (such as config changes)
3934
/code-settings.sh
4035

36+
# Build the localisation cache ahead of makinng bulk requests (as building it can cause issues)
37+
php maintenance/rebuildLocalisationCache.php --lang en
38+
# And disable any recaching on web requests
39+
echo "\$wgLocalisationCacheConf['manualRecache'] = true;" >> LocalSettings.php
40+
4141
# Mark the entrypoint as having run!
4242
echo "entrypoint done!" > entrypoint-done.txt
4343

‎settings/lightweight-mwCacheDirectory.sh‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# All of the lightweight settings in one!
2+
3+
# No jobs run after requests
4+
# https://www.mediawiki.org/wiki/Manual:Job_queue#Performance_issue
5+
echo "\$wgJobRunRate = 0;" >> LocalSettings.php
6+
7+
# 1.35 maintains 2 terms storage backends, only write to one of them!
8+
# These write might all end up in the job queue anyway, so this may have no difference affect in comparison to mwNoJobs
9+
echo "\$wgWBRepoSettings['tmpPropertyTermsMigrationStage'] = MIGRATION_NEW;" >> LocalSettings.php
10+
echo "\$wgWBRepoSettings['tmpItemTermsMigrationStages'] = [ 'max' => MIGRATION_NEW ];" >> LocalSettings.php
11+
echo "\$wgWBRepoSettings['tmpItemSearchMigrationStage'] = MIGRATION_NEW;" >> LocalSettings.php
12+
echo "\$wgWBRepoSettings['tmpPropertySearchMigrationStage'] = MIGRATION_NEW;" >> LocalSettings.php
13+
14+
# No recording of data in wb_changes table (for dispatching to clients)
15+
# https://doc.wikimedia.org/Wikibase/master/php/md_docs_topics_options.html#autotoc_md261
16+
echo "\$wgWBRepoSettings['useChangesTable'] = false;" >> LocalSettings.php
17+
18+
# Use a seperate DB connection for ID allocation to reduce contention
19+
# https://doc.wikimedia.org/Wikibase/master/php/md_docs_topics_options.html#repo_idGeneratorSeparateDbConnection
20+
echo "\$wgWBRepoSettings['idGeneratorSeparateDbConnection'] = true;" >> LocalSettings.php
21+
22+
## Set $wgCacheDirectory to a writable directory on the web server
23+
## to make your wiki go slightly faster. The directory should not
24+
## be publicly accessible from the web.
25+
echo "\$wgCacheDirectory = \"\$IP/cache\";" >> LocalSettings.php

‎settings/lightweight-wbNoSharedCache.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ echo "\$wgWBRepoSettings['idGeneratorSeparateDbConnection'] = true;" >> LocalSet
2121

2222
# Do not use a shared Wikibase cache, this is mainly useful for multi site setups? or reads?
2323
# https://doc.wikimedia.org/Wikibase/master/php/md_docs_topics_options.html#common_sharedCacheType
24-
echo "\$wgWBRepoSettings['useChangessharedCacheTypeTable'] = CACHE_NONE;" >> LocalSettings.php
24+
echo "\$wgWBRepoSettings['sharedCacheType'] = CACHE_NONE;" >> LocalSettings.php

‎settings/mwCacheDirectory.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
## Set $wgCacheDirectory to a writable directory on the web server
2+
## to make your wiki go slightly faster. The directory should not
3+
## be publicly accessible from the web.
4+
echo "\$wgCacheDirectory = \"\$IP/cache\";" >> LocalSettings.php

‎settings/wbNoSharedCache.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Do not use a shared Wikibase cache, this is mainly useful for multi site setups? or reads?
22
# https://doc.wikimedia.org/Wikibase/master/php/md_docs_topics_options.html#common_sharedCacheType
3-
echo "\$wgWBRepoSettings['useChangessharedCacheTypeTable'] = CACHE_NONE;" >> LocalSettings.php
3+
echo "\$wgWBRepoSettings['sharedCacheType'] = CACHE_NONE;" >> LocalSettings.php

0 commit comments

Comments
 (0)