Browse Source

Remove mysql configuration that was breaking new installations (#3056)

The custom apparmor settings in usr.sbin.mysqld (now deleted) are much
different than the default settings that come with a current mysql
installation; the custom settings just look wrong.  Using the custom
settings causes apparmor-related errors to appear in syslog and causes
a fresh mysql installation to fail.

Setting inndodb_buffer_pool_size to 13G meant that in our local VMs,
mysql would consume all available memory and crash on startup.  Apparently
this is not an issue in the Server Central environment, but 13G seems
unreasonably high.  Isn't the ideal value for that setting proportional
to the amount of data in our database, which is very little?  That seems
to be the case based on what I'm reading here:

  https://dba.stackexchange.com/a/27341
Michael Hixson 7 years ago
parent
commit
43110ca49c

+ 0 - 1
toolset/setup/linux/databases/mysql/my.cnf

@@ -49,7 +49,6 @@ tmp_table_size          = 128M
 innodb_use_native_aio   = 1
 innodb_use_native_aio   = 1
 # sync for every sec. not for every commit.
 # sync for every sec. not for every commit.
 innodb_flush_log_at_trx_commit = 2
 innodb_flush_log_at_trx_commit = 2
-innodb_buffer_pool_size = 13G
 innodb_flush_method=O_DIRECT
 innodb_flush_method=O_DIRECT
 innodb_buffer_pool_instances=14
 innodb_buffer_pool_instances=14
 
 

+ 0 - 3
toolset/setup/linux/databases/mysql/mysql.sh

@@ -7,7 +7,6 @@ fw_installed mysql && return 0
 # send over the required files
 # send over the required files
 scp $FWROOT/toolset/setup/linux/databases/mysql/create.sql $DBHOST:~/
 scp $FWROOT/toolset/setup/linux/databases/mysql/create.sql $DBHOST:~/
 scp $FWROOT/toolset/setup/linux/databases/mysql/my.cnf $DBHOST:~/
 scp $FWROOT/toolset/setup/linux/databases/mysql/my.cnf $DBHOST:~/
-scp $FWROOT/toolset/setup/linux/databases/mysql/usr.sbin.mysqld $DBHOST:~/
 scp $FWROOT/toolset/setup/linux/databases/mysql/mysql.list $DBHOST:~/
 scp $FWROOT/toolset/setup/linux/databases/mysql/mysql.list $DBHOST:~/
 
 
 # install mysql on database machine
 # install mysql on database machine
@@ -29,8 +28,6 @@ sudo rm -rf /ssd/mysql
 sudo rm -rf /ssd/log/mysql
 sudo rm -rf /ssd/log/mysql
 sudo cp -R -p /var/lib/mysql /ssd/
 sudo cp -R -p /var/lib/mysql /ssd/
 sudo cp -R -p /var/log/mysql /ssd/log
 sudo cp -R -p /var/log/mysql /ssd/log
-sudo cp usr.sbin.mysqld /etc/apparmor.d/
-sudo /etc/init.d/apparmor reload
 sudo service mysql start
 sudo service mysql start
 EOF
 EOF
 
 

+ 0 - 53
toolset/setup/linux/databases/mysql/usr.sbin.mysqld

@@ -1,53 +0,0 @@
-# vim:syntax=apparmor
-# Last Modified: Tue Jun 19 17:37:30 2007
-#include <tunables/global>
-
-/usr/sbin/mysqld {
-  #include <abstractions/base>
-  #include <abstractions/nameservice>
-  #include <abstractions/user-tmp>
-  #include <abstractions/mysql>
-  #include <abstractions/winbind>
-
-  capability dac_override,
-  capability sys_resource,
-  capability setgid,
-  capability setuid,
-
-  network tcp,
-
-  /etc/hosts.allow r,
-  /etc/hosts.deny r,
-
-  /etc/mysql/*.pem r,
-  /etc/mysql/conf.d/ r,
-  /etc/mysql/conf.d/* r,
-  /etc/mysql/*.cnf r,
-  /usr/lib/mysql/plugin/ r,
-  /usr/lib/mysql/plugin/*.so* mr,
-  /usr/sbin/mysqld mr,
-  /usr/share/mysql/** r,
-  /var/log/** rwk,
-  /var/log/mysql.log rw,
-  /var/log/mysql.err rw,
-  /var/lib/mysql/ r,
-  /var/lib/mysql/** rwk,
-  /var/log/mysql/ r,
-  /var/log/mysql/* rw,
-  /var/run/mysqld/mysqld.pid w,
-  /var/run/mysqld/mysqld.sock w,
-  /run/mysqld/** rwk,
-  /run/mysqld/mysqld.pid w,
-  /run/mysqld/mysqld.sock w,
-  /ssd/log/mysql.log rw,
-  /ssd/log/mysql.err rw,
-  /ssd/mysql/ r,
-  /ssd/mysql/** rwk,
-  /ssd/log/mysql/ r,
-  /ssd/log/mysql/* rw,
-
-  /sys/devices/system/cpu/ r,
-
-  # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.sbin.mysqld>
-}