Revert "set innodb_file_per_table to ON for MySQL / Galera"

This reverts commit 621ea892a2.

We're getting performance problems on SATA disks.

Change-Id: I30312fd5ca3405694d57e6a4ff98b490de388b92
Closes-Bug: #1661396
Related-Bug: #1660722
This commit is contained in:
Alex Schultz 2017-02-02 21:29:32 +00:00
parent da0e9fdf5a
commit 3f7e74ab24
3 changed files with 7 additions and 29 deletions

View File

@ -119,14 +119,13 @@ class tripleo::profile::base::database::mysql (
# MysqlNetwork and ControllerHostnameResolveNetwork in ServiceNetMap
$mysql_server_default = {
'mysqld' => {
'bind-address' => $bind_address,
'max_connections' => hiera('mysql_max_connections'),
'open_files_limit' => '-1',
'innodb_file_per_table' => 'ON',
'ssl' => $enable_internal_tls,
'ssl-key' => $tls_keyfile,
'ssl-cert' => $tls_certfile,
'ssl-ca' => undef,
'bind-address' => $bind_address,
'max_connections' => hiera('mysql_max_connections'),
'open_files_limit' => '-1',
'ssl' => $enable_internal_tls,
'ssl-key' => $tls_keyfile,
'ssl-cert' => $tls_certfile,
'ssl-ca' => undef,
}
}
$mysql_server_options_real = deep_merge($mysql_server_default, $mysql_server_options)

View File

@ -75,7 +75,6 @@ class tripleo::profile::pacemaker::database::mysql (
'default-storage-engine' => 'innodb',
'innodb_autoinc_lock_mode' => '2',
'innodb_locks_unsafe_for_binlog'=> '1',
'innodb_file_per_table' => 'ON',
'query_cache_size' => '0',
'query_cache_type' => '0',
'bind-address' => $bind_address,

View File

@ -1,20 +0,0 @@
---
features:
- Enable innodb_file_per_table for MySQL/MariaDB databases
upgrade:
- |
Newly created MySQL database tables will be stored in their own datafiles,
instead of in a single monolithic ibdata file.
- |
Existing MySQL database tables that are persisted within the monolithic
ibdata file will remain so unless the database is migrated as well.
- |
Migration of all current database tables out of the monolithic ibdata
file is possible by dumping and restoring the whole database to a new data
directory, however when using Galera the entire cluster must be shut
down and upgraded at once.
- |
Migration of individual tables to datafiles is possible using the
MySQL command "ALTER TABLE <databasename>.<tablename> ENGINE=InnoDB;",
however this will not shrink the ibdata file and also is not safe to run
on a running Galera cluster for large tables.