Page MenuHomeDevCentral
Files F37550244

D4135.diff10844.diff
No OneTemporary
Actions

D4135.diff10844.diff
View Options

diff --git a/pillar/dbserver/ysul.sls b/pillar/dbserver/ysul.sls
new file mode 100644
--- /dev/null
+++ b/pillar/dbserver/ysul.sls
@@ -0,0 +1,17 @@
+# -------------------------------------------------------------
+# Database configuration for ysul
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# License: Trivial work, not eligible to copyright
+# -------------------------------------------------------------
+
+# -------------------------------------------------------------
+# MySQL (MariaDB)
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+dbserver_mysql:
+
+ server:
+ # Computed from information_schema.tables InnoDB data/index size,
+ # see T1130 for the sizing query.
+ innodb_buffer_pool_size: 2G
diff --git a/pillar/top.sls b/pillar/top.sls
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -57,6 +57,7 @@
- mailserver.postfix
ysul:
+ - dbserver.ysul
- devserver.repos
- devserver.ports
- saas.mediawiki
diff --git a/roles/dbserver-mysql/mysql-server/cnf.sls b/roles/dbserver-mysql/mysql-server/cnf.sls
--- a/roles/dbserver-mysql/mysql-server/cnf.sls
+++ b/roles/dbserver-mysql/mysql-server/cnf.sls
@@ -40,6 +40,7 @@
etc: {{ dirs.etc }}
share: {{ dirs.share }}
use_zfs: {{ use_zfs }}
+ innodb_buffer_pool_size: {{ salt["pillar.get"]("dbserver_mysql:server:innodb_buffer_pool_size", "410M") }}
{% if is_devserver %}
listen_ip: 127.0.0.1
diff --git a/roles/dbserver-mysql/mysql-server/files/conf.d/server.cnf b/roles/dbserver-mysql/mysql-server/files/conf.d/server.cnf
--- a/roles/dbserver-mysql/mysql-server/files/conf.d/server.cnf
+++ b/roles/dbserver-mysql/mysql-server/files/conf.d/server.cnf
@@ -57,7 +57,7 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
default-storage-engine = InnoDB
-innodb_buffer_pool_size = 410M
+innodb_buffer_pool_size = {{ innodb_buffer_pool_size }}
{% if use_zfs %}
innodb_data_home_dir = /var/db/mysql/mysql-innodb-data

File Metadata

Mime Type
text/plain
Expires
Wed, Jul 22, 04:19 (11 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3940229
Default Alt Text
D4135.diff10844.diff (2 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator