From 392e5e0ecbc46169ded3c530f7fdb0778dd7a888 Mon Sep 17 00:00:00 2001 From: Peter Vicman Date: Sun, 20 Jan 2019 19:05:06 +0100 Subject: [PATCH] mariadb: config file fix to speed it up --- packages/addons/service/mariadb/changelog.txt | 6 ++++++ packages/addons/service/mariadb/package.mk | 6 +++--- .../service/mariadb/source/bin/mariadb.start | 1 + .../addons/service/mariadb/source/config/my.cnf | 17 +++++++++-------- .../source/profile.d/99-mysql-histfile.profile | 4 ++++ .../source/system.d/service.mariadb.service | 1 + 6 files changed, 24 insertions(+), 11 deletions(-) create mode 100644 packages/addons/service/mariadb/source/profile.d/99-mysql-histfile.profile diff --git a/packages/addons/service/mariadb/changelog.txt b/packages/addons/service/mariadb/changelog.txt index af9f010a45..e9337ad2fd 100644 --- a/packages/addons/service/mariadb/changelog.txt +++ b/packages/addons/service/mariadb/changelog.txt @@ -1,2 +1,8 @@ +101 +- update MariaDB to 10.3.12 + removed optimizer_search_depth from config file to speed it up + moved some paths for logs to addon home + added alias for service name (mariadb == service.mariadb) + 100 - initial version diff --git a/packages/addons/service/mariadb/package.mk b/packages/addons/service/mariadb/package.mk index 905d6e75ff..25ab5ecd8b 100644 --- a/packages/addons/service/mariadb/package.mk +++ b/packages/addons/service/mariadb/package.mk @@ -2,9 +2,9 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="mariadb" -PKG_VERSION="10.3.11" -PKG_REV="100" -PKG_SHA256="211655b794c9d5397ba3be6c90737eac02e882f296268299239db47ba328f1b2" +PKG_VERSION="10.3.12" +PKG_REV="101" +PKG_SHA256="f7449a34c25e0455928d7983dae83fd2069fe1f16c4c5f4aeed9ed9d3f081ff6" PKG_LICENSE="GPL2" PKG_SITE="https://mariadb.org" PKG_URL="https://downloads.mariadb.org/interstitial/${PKG_NAME}-${PKG_VERSION}/source/${PKG_NAME}-${PKG_VERSION}.tar.gz" diff --git a/packages/addons/service/mariadb/source/bin/mariadb.start b/packages/addons/service/mariadb/source/bin/mariadb.start index 5a05c3a24a..c3094f349c 100755 --- a/packages/addons/service/mariadb/source/bin/mariadb.start +++ b/packages/addons/service/mariadb/source/bin/mariadb.start @@ -42,6 +42,7 @@ if [ ! -d "$ADDON_HOME/data/mysql" ]; then fi # init script to create user kodi and change passwords +init_file="" if [[ ! -f $ADDON_DIR/set_mysql_passwords.sql ]] || [[ $CUR_XML -nt $ADDON_DIR/set_mysql_passwords.sql ]]; then cat << SQL_DATA > $ADDON_DIR/set_mysql_passwords.sql SET PASSWORD FOR 'root'@'localhost'=PASSWORD('$MYSQL_ROOT_PASS'); diff --git a/packages/addons/service/mariadb/source/config/my.cnf b/packages/addons/service/mariadb/source/config/my.cnf index 7f3fd3191e..44fbc9edda 100644 --- a/packages/addons/service/mariadb/source/config/my.cnf +++ b/packages/addons/service/mariadb/source/config/my.cnf @@ -89,7 +89,7 @@ query_cache_size = 64M # Both location gets rotated by the cronjob. # Be aware that this log type is a performance killer. # As of 5.1 you can enable the log at runtime! -#general_log_file = /var/log/mysql/mysql.log +#general_log_file = /storage/.kodi/userdata/addon_data/service.mariadb/mysql.log #general_log = 1 # # Error logging goes to syslog due to /etc/mysql/conf.d/mysqld_safe_syslog.cnf. @@ -99,7 +99,7 @@ log_warnings = 2 # # Enable the slow query log to see queries with especially long duration #slow_query_log[={0|1}] -slow_query_log_file = /var/log/mysql/mariadb-slow.log +slow_query_log_file = /storage/.kodi/userdata/addon_data/mariadb-slow.log long_query_time = 10 #log_slow_rate_limit = 1000 log_slow_verbosity = query_plan @@ -115,16 +115,16 @@ log_slow_verbosity = query_plan #auto_increment_increment = 2 #auto_increment_offset = 1 # disable binary log -#log_bin = /var/log/mysql/mariadb-bin -#log_bin_index = /var/log/mysql/mariadb-bin.index +#log_bin = /storage/.kodi/userdata/addon_data/service.mariadb/mariadb-bin +#log_bin_index = /storage/.kodi/userdata/addon_data/service.mariadb/mariadb-bin.index # not fab for performance, but safer #sync_binlog = 1 expire_logs_days = 10 max_binlog_size = 100M # slaves -#relay_log = /var/log/mysql/relay-bin -#relay_log_index = /var/log/mysql/relay-bin.index -#relay_log_info_file = /var/log/mysql/relay-bin.info +#relay_log = /storage/.kodi/userdata/addon_data/service.mariadb/relay-bin +#relay_log_index = /storage/.kodi/userdata/addon_data/service.mariadb/relay-bin.index +#relay_log_info_file = /storage/.kodi/userdata/addon_data/service.mariadb/relay-bin.info #log_slave_updates #read_only # @@ -160,7 +160,8 @@ innodb_io_capacity = 400 innodb_flush_method = O_DIRECT character-set-server=utf8 # This avoids potential pitfalls with text in exotic codepages. #skip-name-resolve # Avoids name resolving in the local network, thus reducing overhead. That also means that all connections are done by IP only. -optimizer_search_depth=1 # Here we are, this is winner of the year. +# well, not really according to use cases :( +#optimizer_search_depth=0 # Here we are, this is winner of the year. # # * Security Features diff --git a/packages/addons/service/mariadb/source/profile.d/99-mysql-histfile.profile b/packages/addons/service/mariadb/source/profile.d/99-mysql-histfile.profile new file mode 100644 index 0000000000..9f1a35133c --- /dev/null +++ b/packages/addons/service/mariadb/source/profile.d/99-mysql-histfile.profile @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) + +export MYSQL_HISTFILE=/storage/.kodi/userdata/addon_data/service.mariadb/mysql_history diff --git a/packages/addons/service/mariadb/source/system.d/service.mariadb.service b/packages/addons/service/mariadb/source/system.d/service.mariadb.service index b5cd63ff84..d32054a973 100644 --- a/packages/addons/service/mariadb/source/system.d/service.mariadb.service +++ b/packages/addons/service/mariadb/source/system.d/service.mariadb.service @@ -15,4 +15,5 @@ RestartSec=10 StartLimitInterval=0 [Install] +Alias=mariadb.service WantedBy=kodi.service