more sql connections & use dir for mw cache

addshore · addshore · commit e6ade5c2672c · 2021-03-07T15:41:05.000Z
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -29,7 +29,7 @@ jobs:
           # - default
           - lightweight
 #          - lightweight-wbNoSharedCache
-#          - lightweight-mwCacheDirectory
+          - lightweight-mwCacheDirectory
           # - mwCacheDirectory
           # - mwNoJobs
           # - wbNoChangesTable
diff --git a/README.md b/README.md
@@ -16,9 +16,10 @@ Steps:
 You can also try running them locally... For example...
 
 ```sh
-PROFILE_IMAGE=wikibase/wikibase:1.35-base PROFILE_SETTINGS=lightweight PROFILE_SQL=mariadb:10.5 docker-compose up -d
+PROFILE_IMAGE=wikibase/wikibase:1.35-base PROFILE_SETTINGS=lightweight-mwCacheDirectory PROFILE_SQL=mariadb:10.5 docker-compose up -d mysql wikibase1
 ./docker-compose-wait1.sh
+PROFILE_IMAGE=wikibase/wikibase:1.35-base PROFILE_SETTINGS=lightweight-mwCacheDirectory PROFILE_SQL=mariadb:10.5 docker-compose up -d wikibase2
 ./docker-compose-wait2.sh
-sleep 3
-ASYNC=40 INSTANCES=2 ./loads/2000EmptyItems.sh
+sleep 5
+ASYNC=150 INSTANCES=2 ./loads/2000EmptyItems.sh
 ```
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,6 +7,7 @@ services:
     volumes:
       - ./:/code-repo
       - ./settings/${PROFILE_SETTINGS}.sh:/code-settings.sh
+      - ./apache.extra.conf:/etc/apache2/conf-available/wb-profile.extra.conf
     links:
       - mysql
     ports:
@@ -19,6 +20,7 @@ services:
     volumes:
       - ./:/code-repo
       - ./settings/${PROFILE_SETTINGS}.sh:/code-settings.sh
+      - ./apache.extra.conf:/etc/apache2/conf-available/wb-profile.extra.conf
     links:
       - mysql
     ports:
diff --git a/my.extra.cnf b/my.extra.cnf
@@ -1,2 +1,2 @@
 [mysqld]
-max_connections=500
+max_connections=1000
diff --git a/settings/lightweight-mwCacheDirectory.sh b/settings/lightweight-mwCacheDirectory.sh
@@ -23,3 +23,5 @@ echo "\$wgWBRepoSettings['idGeneratorSeparateDbConnection'] = true;" >> LocalSet
 ## to make your wiki go slightly faster. The directory should not
 ## be publicly accessible from the web.
 echo "\$wgCacheDirectory = \"\$IP/cache\";" >> LocalSettings.php
+mkdir cache
+chmod -R 775 cache
diff --git a/settings/mwCacheDirectory.sh b/settings/mwCacheDirectory.sh
@@ -2,3 +2,5 @@
 ## to make your wiki go slightly faster. The directory should not
 ## be publicly accessible from the web.
 echo "\$wgCacheDirectory = \"\$IP/cache\";" >> LocalSettings.php
+mkdir cache
+chmod -R 775 cache

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`[mysqld]`
`2`		`-max_connections=500`
	`2`	`+max_connections=1000`