diff options
| author | nachoparker <nacho@ownyourbits.com> | 2020-08-02 19:34:06 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2020-08-02 19:34:08 +0300 |
| commit | 06017a4bcf8d2ee868716cfa7b7bc65a06bad58d (patch) | |
| tree | 20f8cdda44b38d15012feda1f4fbd876089985c1 | |
| parent | dda010bed44d6e764fa9e3c2b41295b15317d2b3 (diff) | |
nc-limits: adjust db sizev1.28.2
Signed-off-by: nachoparker <nacho@ownyourbits.com>
| -rw-r--r-- | bin/ncp/CONFIG/nc-limits.sh | 7 | ||||
| -rw-r--r-- | changelog.md | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/bin/ncp/CONFIG/nc-limits.sh b/bin/ncp/CONFIG/nc-limits.sh index e3f7cf97..472c4168 100644 --- a/bin/ncp/CONFIG/nc-limits.sh +++ b/bin/ncp/CONFIG/nc-limits.sh @@ -38,8 +38,11 @@ configure() sed -i "s|^pm =.*|pm = static|" "$CONF" sed -i "s|^pm.max_children =.*|pm.max_children = $PHPTHREADS|" "$CONF" - # DATABASE MEMORY - AUTOMEM=$(( TOTAL_MEM * 40 / 100 )) + # DATABASE MEMORY (25%) + AUTOMEM=$(( TOTAL_MEM * 25 / 100 )) + # Maximum MySQL Memory Usage = innodb_buffer_pool_size + key_buffer_size + (read_buffer_size + sort_buffer_size) X max_connections + # leave 16MiB for key_buffer_size and a bit more + AUTOMEM=$(( AUTOMEM - (16 + 32) * 1024 * 1024 )) local CONF=/etc/mysql/mariadb.conf.d/91-ncp.cnf local CURRENT_DB_MEM=$(grep "^innodb_buffer_pool_size" "$CONF" | awk '{ print $3 }') echo "Using $AUTOMEM memory for the database" diff --git a/changelog.md b/changelog.md index e466e254..065c9113 100644 --- a/changelog.md +++ b/changelog.md @@ -1,11 +1,13 @@ -[v1.28.1](https://github.com/nextcloud/nextcloudpi/commit/2528f18) (2020-08-02) nc-ramlogs: pin version +[v1.28.2](https://github.com/nextcloud/nextcloudpi/commit/a2e6356) (2020-08-02) nc-limits: adjust db size -[v1.28.0](https://github.com/nextcloud/nextcloudpi/commit/99cfe9b) (2020-07-23) upgrade to NC18.0.7 +[v1.28.1](https://github.com/nextcloud/nextcloudpi/commit/dda010b) (2020-08-02) nc-ramlogs: pin version + +[v1.28.0 ](https://github.com/nextcloud/nextcloudpi/commit/99cfe9b) (2020-07-23) upgrade to NC18.0.7 [v1.27.0 ](https://github.com/nextcloud/nextcloudpi/commit/3c96d2e) (2020-07-05) upgrade to NC18.0.6 -[v1.26.2, master](https://github.com/nextcloud/nextcloudpi/commit/337ffeb) (2020-06-13) ncp-autoupdate: cronjob write to the log only (#1144) +[v1.26.2 ](https://github.com/nextcloud/nextcloudpi/commit/337ffeb) (2020-06-13) ncp-autoupdate: cronjob write to the log only (#1144) [v1.26.1 ](https://github.com/nextcloud/nextcloudpi/commit/4e79386) (2020-06-13) ncp-web: fix port checking |