server_maint 0.0.4 → 0.0.5

data/lib/cookbooks/mysql/CHANGELOG.md

@@ -1,3 +1,42 @@
+## v2.1.0:
+
+* [COOK-1669] - Using platform("ubuntu") in default attributes always
+  returns true
+* [COOK-1694] - Added additional my.cnf fields and reorganized
+  cookbook to avoid race conditions with mysql startup and sql script
+  execution
+* [COOK-1851] - Support server-id and binlog_format settings
+* [COOK-1929] - Update msyql server attributes file because setting
+  attributes without specifying a precedence is deprecated
+* [COOK-1999] - Add read_only tunable useful for replication slave
+  servers
+
+## v2.0.2:
+
+* [COOK-1967] - mysql: trailing comma in server.rb platform family
+
+## v2.0.0:
+
+**Important note for this release**
+
+Under Chef Solo, you must set the node attributes for the root, debian
+and repl passwords or the run will completely fail. See COOK-1737 for
+background on this.
+
+* [COOK-1390] - MySQL service cannot start after reboot
+* [COOK-1610] - Set root password outside preseed (blocker for drop-in mysql
+  replacements)
+* [COOK-1624] - Mysql cookbook fails to even compile on windows
+* [COOK-1669] - Using platform("ubuntu") in default attributes always returns true
+* [COOK-1686] - Add mysql service start
+* [COOK-1687] - duplicate `innodb_buffer_pool_size` attribute
+* [COOK-1704] - mysql cookbook fails spec tests when minitest-handler cookbook enabled
+* [COOK-1737] - Fail a chef-solo run when `server_root_password`,
+  `server_debian_password`, and/or `server_repl_password` is not set
+* [COOK-1769] - link to database recipe in mysql README goes to old opscode/cookbooks
+  repo instead of opscode-cookbook organization
+* [COOK-1963] - use `platform_family`
+
 ## v1.3.0:
 
 **Important note for this release**

data/lib/cookbooks/mysql/attributes/client.rb

@@ -20,10 +20,10 @@
 # to debian_before_squeeze? and ubuntu_before_lucid?
 ::Chef::Node.send(:include, Opscode::Mysql::Helpers)
 
-case node['platform']
-when "centos", "redhat", "suse", "fedora", "scientific", "amazon"
+case node['platform_family']
+when "rhel", "suse", "fedora"
   default['mysql']['client']['packages'] = %w{mysql mysql-devel}
-when "ubuntu","debian"
+when "debian"
   if debian_before_squeeze? || ubuntu_before_lucid?
     default['mysql']['client']['packages'] = %w{mysql-client libmysqlclient15-dev}
   else

data/lib/cookbooks/mysql/attributes/server.rb

@@ -19,25 +19,46 @@
 
 default['mysql']['bind_address']               = attribute?('cloud') ? cloud['local_ipv4'] : ipaddress
 default['mysql']['port']                       = 3306
+default['mysql']['nice']                       = 0
 
-case node["platform"]
-when "centos", "redhat", "fedora", "suse", "scientific", "amazon"
+case node["platform_family"]
+when "debian"
+  default['mysql']['server']['packages']      = %w{mysql-server}
+  default['mysql']['service_name']            = "mysql"
+  default['mysql']['basedir']                 = "/usr"
+  default['mysql']['data_dir']                = "/var/lib/mysql"
+  default['mysql']['root_group']              = "root"
+  default['mysql']['mysqladmin_bin']          = "/usr/bin/mysqladmin"
+  default['mysql']['mysql_bin']               = "/usr/bin/mysql"
+
+  default['mysql']['conf_dir']                    = '/etc/mysql'
+  default['mysql']['confd_dir']                   = '/etc/mysql/conf.d'
+  default['mysql']['socket']                      = "/var/run/mysqld/mysqld.sock"
+  default['mysql']['pid_file']                    = "/var/run/mysqld/mysqld.pid"
+  default['mysql']['old_passwords']               = 0
+  default['mysql']['grants_path']                 = "/etc/mysql/grants.sql"
+when "rhel", "fedora", "suse"
+  if node["mysql"]["version"].to_f >= 5.5
+    default['mysql']['service_name']            = "mysql"
+    default['mysql']['pid_file']                    = "/var/run/mysql/mysql.pid"
+  else
+    default['mysql']['service_name']            = "mysqld"
+    default['mysql']['pid_file']                    = "/var/run/mysqld/mysqld.pid"
+  end
   default['mysql']['server']['packages']      = %w{mysql-server}
-  default['mysql']['service_name']            = "mysqld"
   default['mysql']['basedir']                 = "/usr"
   default['mysql']['data_dir']                = "/var/lib/mysql"
   default['mysql']['root_group']              = "root"
   default['mysql']['mysqladmin_bin']          = "/usr/bin/mysqladmin"
   default['mysql']['mysql_bin']               = "/usr/bin/mysql"
 
-  set['mysql']['conf_dir']                    = '/etc'
-  set['mysql']['confd_dir']                   = '/etc/mysql/conf.d'
-  set['mysql']['socket']                      = "/var/lib/mysql/mysql.sock"
-  set['mysql']['pid_file']                    = "/var/run/mysqld/mysqld.pid"
-  set['mysql']['old_passwords']               = 1
-  set['mysql']['grants_path']                 = "/etc/mysql_grants.sql"
+  default['mysql']['conf_dir']                    = '/etc'
+  default['mysql']['confd_dir']                   = '/etc/mysql/conf.d'
+  default['mysql']['socket']                      = "/var/lib/mysql/mysql.sock"
+  default['mysql']['old_passwords']               = 1
+  default['mysql']['grants_path']                 = "/etc/mysql_grants.sql"
   # RHEL/CentOS mysql package does not support this option.
-  set['mysql']['tunable']['innodb_adaptive_flushing'] = false
+  default['mysql']['tunable']['innodb_adaptive_flushing'] = false
 when "freebsd"
   default['mysql']['server']['packages']      = %w{mysql55-server}
   default['mysql']['service_name']            = "mysql-server"
@@ -47,12 +68,12 @@ when "freebsd"
   default['mysql']['mysqladmin_bin']          = "/usr/local/bin/mysqladmin"
   default['mysql']['mysql_bin']               = "/usr/local/bin/mysql"
 
-  set['mysql']['conf_dir']                    = '/usr/local/etc'
-  set['mysql']['confd_dir']                   = '/usr/local/etc/mysql/conf.d'
-  set['mysql']['socket']                      = "/tmp/mysqld.sock"
-  set['mysql']['pid_file']                    = "/var/run/mysqld/mysqld.pid"
-  set['mysql']['old_passwords']               = 0
-  set['mysql']['grants_path']                 = "/var/db/mysql/grants.sql"
+  default['mysql']['conf_dir']                    = '/usr/local/etc'
+  default['mysql']['confd_dir']                   = '/usr/local/etc/mysql/conf.d'
+  default['mysql']['socket']                      = "/tmp/mysqld.sock"
+  default['mysql']['pid_file']                    = "/var/run/mysqld/mysqld.pid"
+  default['mysql']['old_passwords']               = 0
+  default['mysql']['grants_path']                 = "/var/db/mysql/grants.sql"
 when "windows"
   default['mysql']['server']['packages']      = ["MySQL Server 5.5"]
   default['mysql']['version']                 = '5.5.21'
@@ -62,14 +83,14 @@ when "windows"
 
   default['mysql']['service_name']            = "mysql"
   default['mysql']['basedir']                 = "#{ENV['SYSTEMDRIVE']}\\Program Files (x86)\\MySQL\\#{mysql['server']['packages'].first}"
-  default['mysql']['data_dir']                = "#{mysql['basedir']}\\Data"
-  default['mysql']['bin_dir']                 = "#{mysql['basedir']}\\bin"
-  default['mysql']['mysqladmin_bin']          = "#{mysql['bin_dir']}\\mysqladmin"
-  default['mysql']['mysql_bin']               = "#{mysql['bin_dir']}\\mysql"
+  default['mysql']['data_dir']                = "#{node['mysql']['basedir']}\\Data"
+  default['mysql']['bin_dir']                 = "#{node['mysql']['basedir']}\\bin"
+  default['mysql']['mysqladmin_bin']          = "#{node['mysql']['bin_dir']}\\mysqladmin"
+  default['mysql']['mysql_bin']               = "#{node['mysql']['bin_dir']}\\mysql"
 
-  default['mysql']['conf_dir']                = "#{mysql['basedir']}"
+  default['mysql']['conf_dir']                = node['mysql']['basedir']
   default['mysql']['old_passwords']           = 0
-  default['mysql']['grants_path']             = "#{mysql['conf_dir']}\\grants.sql"
+  default['mysql']['grants_path']             = "#{node['mysql']['conf_dir']}\\grants.sql"
 when "mac_os_x"
   default['mysql']['server']['packages']      = %w{mysql}
   default['mysql']['basedir']                 = "/usr/local/Cellar"
@@ -86,12 +107,12 @@ else
   default['mysql']['mysqladmin_bin']          = "/usr/bin/mysqladmin"
   default['mysql']['mysql_bin']               = "/usr/bin/mysql"
 
-  set['mysql']['conf_dir']                    = '/etc/mysql'
-  set['mysql']['confd_dir']                   = '/etc/mysql/conf.d'
-  set['mysql']['socket']                      = "/var/run/mysqld/mysqld.sock"
-  set['mysql']['pid_file']                    = "/var/run/mysqld/mysqld.pid"
-  set['mysql']['old_passwords']               = 0
-  set['mysql']['grants_path']                 = "/etc/mysql/grants.sql"
+  default['mysql']['conf_dir']                    = '/etc/mysql'
+  default['mysql']['confd_dir']                   = '/etc/mysql/conf.d'
+  default['mysql']['socket']                      = "/var/run/mysqld/mysqld.sock"
+  default['mysql']['pid_file']                    = "/var/run/mysqld/mysqld.pid"
+  default['mysql']['old_passwords']               = 0
+  default['mysql']['grants_path']                 = "/etc/mysql/grants.sql"
 end
 
 if attribute?('ec2')
@@ -102,52 +123,118 @@ end
 
 default['mysql']['reload_action'] = "restart" # or "reload" or "none"
 
-default['mysql']['use_upstart'] = node.platform?("ubuntu") && node.platform_version.to_f >= 10.04
+default['mysql']['use_upstart'] = node['platform'] == "ubuntu" && node['platform_version'].to_f >= 10.04
 
 default['mysql']['auto-increment-increment']        = 1
 default['mysql']['auto-increment-offset']           = 1
 
 default['mysql']['allow_remote_root']               = false
+default['mysql']['tunable']['character-set-server'] = "utf8"
+default['mysql']['tunable']['collation-server']     = "utf8_general_ci"
 default['mysql']['tunable']['back_log']             = "128"
 default['mysql']['tunable']['key_buffer']           = "256M"
+default['mysql']['tunable']['myisam_sort_buffer_size']   = "8M"
+default['mysql']['tunable']['myisam_max_sort_file_size'] = "2147483648"
+default['mysql']['tunable']['myisam_repair_threads']     = "1"
+default['mysql']['tunable']['myisam_recover']            = "BACKUP"
 default['mysql']['tunable']['max_allowed_packet']   = "16M"
 default['mysql']['tunable']['max_connections']      = "800"
-default['mysql']['tunable']['max_heap_table_size']  = "32M"
+default['mysql']['tunable']['max_connect_errors']   = "10"
+default['mysql']['tunable']['concurrent_insert']    = "2"
+default['mysql']['tunable']['connect_timeout']      = "10"
+default['mysql']['tunable']['tmp_table_size']       = "32M"
+default['mysql']['tunable']['max_heap_table_size']  = node['mysql']['tunable']['tmp_table_size']
+default['mysql']['tunable']['bulk_insert_buffer_size'] = node['mysql']['tunable']['tmp_table_size']
 default['mysql']['tunable']['myisam_recover']       = "BACKUP"
 default['mysql']['tunable']['net_read_timeout']     = "30"
 default['mysql']['tunable']['net_write_timeout']    = "30"
 default['mysql']['tunable']['table_cache']          = "128"
-default['mysql']['tunable']['table_open_cache']     = "128"
+
 default['mysql']['tunable']['thread_cache']         = "128"
 default['mysql']['tunable']['thread_cache_size']    = 8
 default['mysql']['tunable']['thread_concurrency']   = 10
 default['mysql']['tunable']['thread_stack']         = "256K"
+default['mysql']['tunable']['sort_buffer_size']     = "2M"
+default['mysql']['tunable']['read_buffer_size']     = "128k"
+default['mysql']['tunable']['read_rnd_buffer_size'] = "256k"
+default['mysql']['tunable']['join_buffer_size']     = "128k"
 default['mysql']['tunable']['wait_timeout']         = "180"
+default['mysql']['tunable']['open-files-limit']     = "8192"
+default['mysql']['tunable']['open-files']           = "1024"
+
+default['mysql']['tunable']['sql_mode'] = nil
+
+default['mysql']['tunable']['skip-character-set-client-handshake'] = false
+default['mysql']['tunable']['skip-name-resolve']                   = false
+
 
+default['mysql']['tunable']['server_id']                       = nil
 default['mysql']['tunable']['log_bin']                         = nil
 default['mysql']['tunable']['log_bin_trust_function_creators'] = false
-default['mysql']['tunable']['relay_log']                       =  nil
+
+default['mysql']['tunable']['relay_log']                       = nil
+default['mysql']['tunable']['relay_log_index']                 = nil
 default['mysql']['tunable']['log_slave_updates']               = false
+
 default['mysql']['tunable']['sync_binlog']                     = 0
 default['mysql']['tunable']['skip_slave_start']                = false
+default['mysql']['tunable']['read_only']                       = false
 
 default['mysql']['tunable']['log_error']                       = nil
+default['mysql']['tunable']['log_warnings']                    = false
 default['mysql']['tunable']['log_queries_not_using_index']     = true
 default['mysql']['tunable']['log_bin_trust_function_creators'] = false
 
-default['mysql']['tunable']['innodb_buffer_pool_size']         = "128M"
 default['mysql']['tunable']['innodb_log_file_size']            = "5M"
+default['mysql']['tunable']['innodb_buffer_pool_size']         = "128M"
+default['mysql']['tunable']['innodb_buffer_pool_instances']    = "4"
 default['mysql']['tunable']['innodb_additional_mem_pool_size'] = "8M"
 default['mysql']['tunable']['innodb_data_file_path']           = "ibdata1:10M:autoextend"
-default['mysql']['tunable']['innodb_flush_log_at_trx_commit']  = "1"
 default['mysql']['tunable']['innodb_flush_method']             = false
 default['mysql']['tunable']['innodb_log_buffer_size']          = "8M"
+default['mysql']['tunable']['innodb_write_io_threads']         = "4"
+default['mysql']['tunable']['innodb_io_capacity']              = "200"
+default['mysql']['tunable']['innodb_file_per_table']           = true
+default['mysql']['tunable']['innodb_lock_wait_timeout']        = "60"
+if node['cpu'].nil? or node['cpu']['total'].nil?
+  default['mysql']['tunable']['innodb_thread_concurrency']       = "8"
+  default['mysql']['tunable']['innodb_commit_concurrency']       = "8"
+  default['mysql']['tunable']['innodb_read_io_threads']          = "8"
+  default['mysql']['tunable']['innodb_flush_log_at_trx_commit']  = "8"
+else
+  default['mysql']['tunable']['innodb_thread_concurrency']       = "#{(Integer(node['cpu']['total'])) * 2}"
+  default['mysql']['tunable']['innodb_commit_concurrency']       = "#{(Integer(node['cpu']['total'])) * 2}"
+  default['mysql']['tunable']['innodb_read_io_threads']          = "#{(Integer(node['cpu']['total'])) * 2}"
+  default['mysql']['tunable']['innodb_flush_log_at_trx_commit']  = "#{(Integer(node['cpu']['total'])) * 2}"
+end
+default['mysql']['tunable']['innodb_support_xa']               = true
+default['mysql']['tunable']['innodb_table_locks']              = true
+default['mysql']['tunable']['skip-innodb-doublewrite']         = false
+
+default['mysql']['tunable']['transaction-isolation'] = nil
 
 default['mysql']['tunable']['query_cache_limit']    = "1M"
 default['mysql']['tunable']['query_cache_size']     = "16M"
 
 default['mysql']['tunable']['log_slow_queries']     = "/var/log/mysql/slow.log"
+default['mysql']['tunable']['slow_query_log']       = node['mysql']['tunable']['log_slow_queries'] # log_slow_queries is deprecated
+                                                                                                   # in favor of slow_query_log
 default['mysql']['tunable']['long_query_time']      = 2
 
 default['mysql']['tunable']['expire_logs_days']     = 10
 default['mysql']['tunable']['max_binlog_size']      = "100M"
+default['mysql']['tunable']['binlog_cache_size']    = "32K"
+
+default['mysql']['tmpdir'] = ["/tmp"]
+default['mysql']['read_only'] = false
+
+default['mysql']['log_dir'] = node['mysql']['data_dir']
+default['mysql']['log_files_in_group'] = false
+default['mysql']['innodb_status_file'] = false
+
+unless node['platform_family'] && node['platform_version'].to_i < 6
+  # older RHEL platforms don't support these options
+  default['mysql']['tunable']['event_scheduler']  = 0
+  default['mysql']['tunable']['table_open_cache'] = "128"
+  default['mysql']['tunable']['binlog_format']    = "statement" if node['mysql']['tunable']['log_bin']
+end

data/lib/cookbooks/mysql/files/default/tests/minitest/server_test.rb

@@ -29,7 +29,7 @@ describe 'mysql::server' do
   end
   describe 'debian' do
     it 'creates a config file for service control' do
-      skip unless ['debian', 'ubuntu'].include?(node[:platform])
+      skip unless ['debian'].include?(node['platform_family'])
       file("#{node['mysql']['conf_dir']}/debian.cnf").must_exist
     end
   end

data/lib/cookbooks/mysql/libraries/helpers.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,13 +21,13 @@ module Opscode
     module Helpers
 
       def debian_before_squeeze?
-        platform?("debian") && (node.platform_version.to_f < 6.0)
+        (node['platform'] == "debian") && (node['platform_version'].to_f < 6.0)
       end
 
       def ubuntu_before_lucid?
-        platform?("ubuntu") && (node.platform_version.to_f < 10.0)
+        (node['platform'] == "ubuntu") && (node['platform_version'].to_f < 10.0)
       end
 
     end
   end
-end
+end

data/lib/cookbooks/mysql/metadata.rb

@@ -4,7 +4,7 @@ maintainer_email  "cookbooks@opscode.com"
 license           "Apache 2.0"
 description       "Installs and configures mysql for client or server"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version           "1.3.0"
+version           "2.1.0"
 recipe            "mysql", "Includes the client recipe to configure a client"
 recipe            "mysql::client", "Installs packages required for mysql clients using run_action magic"
 recipe            "mysql::server", "Installs packages required for mysql servers w/o manual intervention"

data/lib/cookbooks/mysql/recipes/server.rb

@@ -30,18 +30,19 @@ if Chef::Config[:solo]
 
   if !missing_attrs.empty?
     Chef::Application.fatal!([
-      "You must set #{missing_attrs.join(', ')} in chef-solo mode.",
-      "For more information, see https://github.com/opscode-cookbooks/mysql#chef-solo-note"
-    ].join(' '))
+        "You must set #{missing_attrs.join(', ')} in chef-solo mode.",
+        "For more information, see https://github.com/opscode-cookbooks/mysql#chef-solo-note"
+      ].join(' '))
   end
 else
   # generate all passwords
   node.set_unless['mysql']['server_debian_password'] = secure_password
   node.set_unless['mysql']['server_root_password']   = secure_password
   node.set_unless['mysql']['server_repl_password']   = secure_password
+  node.save
 end
 
-if platform?(%w{debian ubuntu})
+if platform_family?(%w{debian})
 
   directory "/var/cache/local/preseeding" do
     owner "root"
@@ -60,7 +61,7 @@ if platform?(%w{debian ubuntu})
     owner "root"
     group node['mysql']['root_group']
     mode "0600"
-    notifies :run, resources(:execute => "preseed mysql-server"), :immediately
+    notifies :run, "execute[preseed mysql-server]", :immediately
   end
 
   template "#{node['mysql']['conf_dir']}/debian.cnf" do
@@ -72,7 +73,7 @@ if platform?(%w{debian ubuntu})
 
 end
 
-if platform? 'windows'
+if platform_family?('windows')
   package_file = node['mysql']['package_file']
 
   remote_file "#{Chef::Config[:file_cache_path]}/#{package_file}" do
@@ -92,19 +93,27 @@ end
 node['mysql']['server']['packages'].each do |package_name|
   package package_name do
     action :install
+    notifies :start, "service[mysql]", :immediately
   end
 end
 
-unless platform?(%w{mac_os_x})
-
-  directory node['mysql']['confd_dir'] do
-    owner "mysql" unless platform? 'windows'
-    group "mysql" unless platform? 'windows'
-    action :create
-    recursive true
+unless platform_family?(%w{mac_os_x})
+
+  [File.dirname(node['mysql']['pid_file']),
+    File.dirname(node['mysql']['tunable']['slow_query_log']),
+    node['mysql']['confd_dir'],
+    node['mysql']['confd_dir'],
+    node['mysql']['log_dir'],
+    node['mysql']['data_dir']].each do |directory_path|
+    directory directory_path do
+      owner "mysql" unless platform? 'windows'
+      group "mysql" unless platform? 'windows'
+      action :create
+      recursive true
+    end
   end
 
-  if platform? 'windows'
+  if platform_family? 'windows'
     require 'win32/service'
 
     windows_path node['mysql']['bin_dir'] do
@@ -117,17 +126,6 @@ unless platform?(%w{mac_os_x})
     end
   end
 
-  service "mysql" do
-    service_name node['mysql']['service_name']
-    if node['mysql']['use_upstart']
-      restart_command "restart mysql"
-      stop_command "stop mysql"
-      start_command "start mysql"
-    end
-    supports :status => true, :restart => true, :reload => true
-    action :enable
-  end
-
   skip_federated = case node['platform']
                    when 'fedora', 'ubuntu', 'amazon'
                      true
@@ -136,30 +134,30 @@ unless platform?(%w{mac_os_x})
                    else
                      false
                    end
+end
 
-  template "#{node['mysql']['conf_dir']}/my.cnf" do
-    source "my.cnf.erb"
-    owner "root" unless platform? 'windows'
-    group node['mysql']['root_group'] unless platform? 'windows'
-    mode "0644"
-    case node['mysql']['reload_action']
-    when 'restart'
-      notifies :restart, resources(:service => "mysql"), :immediately
-    when 'reload'
-      notifies :reload, resources(:service => "mysql"), :immediately
-    else
-      Chef::Log.info "my.cnf updated but mysql.reload_action is #{node['mysql']['reload_action']}. No action taken."
-    end
-    variables :skip_federated => skip_federated
+# Homebrew has its own way to do databases
+if platform_family?(%w{mac_os_x})
+  execute "mysql-install-db" do
+    command "mysql_install_db --verbose --user=`whoami` --basedir=\"$(brew --prefix mysql)\" --datadir=#{node['mysql']['data_dir']} --tmpdir=/tmp"
+    environment('TMPDIR' => nil)
+    action :run
+    creates "#{node['mysql']['data_dir']}/mysql"
+  end
+else
+  execute 'mysql-install-db' do
+    command "mysql_install_db"
+    action :run
+    not_if { File.exists?(node['mysql']['data_dir'] + '/mysql/user.frm') }
   end
-end
 
-unless Chef::Config[:solo]
-  ruby_block "save node data" do
-    block do
-      node.save
+  service "mysql" do
+    service_name node['mysql']['service_name']
+    if node['mysql']['use_upstart']
+      provider Chef::Provider::Service::Upstart
     end
-    action :create
+    supports :status => true, :restart => true, :reload => true
+    action :enable
   end
 end
 
@@ -171,32 +169,23 @@ execute "assign-root-password" do
   only_if "\"#{node['mysql']['mysql_bin']}\" -u root -e 'show databases;'"
 end
 
-# Homebrew has its own way to do databases
-if platform?(%w{mac_os_x})
-
-  execute "mysql-install-db" do
-    command "mysql_install_db --verbose --user=`whoami` --basedir=\"$(brew --prefix mysql)\" --datadir=#{node['mysql']['data_dir']} --tmpdir=/tmp"
-    environment('TMPDIR' => nil)
-    action :run
-    creates "#{node['mysql']['data_dir']}/mysql"
-  end
-
-else
+unless platform_family?(%w{mac_os_x})
   grants_path = node['mysql']['grants_path']
+
   begin
     t = resources("template[#{grants_path}]")
   rescue
     Chef::Log.info("Could not find previously defined grants.sql resource")
     t = template grants_path do
       source "grants.sql.erb"
-      owner "root" unless platform? 'windows'
-      group node['mysql']['root_group'] unless platform? 'windows'
+      owner "root" unless platform_family? 'windows'
+      group node['mysql']['root_group'] unless platform_family? 'windows'
       mode "0600"
       action :create
     end
   end
 
-  if platform? 'windows'
+  if platform_family? 'windows'
     windows_batch "mysql-install-privileges" do
       command "\"#{node['mysql']['mysql_bin']}\" -u root #{node['mysql']['server_root_password'].empty? ? '' : '-p' }\"#{node['mysql']['server_root_password']}\" < \"#{grants_path}\""
       action :nothing
@@ -204,12 +193,28 @@ else
     end
   else
     execute "mysql-install-privileges" do
-      command "\"#{node['mysql']['mysql_bin']}\" -u root #{node['mysql']['server_root_password'].empty? ? '' : '-p' }\"#{node['mysql']['server_root_password']}\" < \"#{grants_path}\""
+      command %Q["#{node['mysql']['mysql_bin']}" -u root #{node['mysql']['server_root_password'].empty? ? '' : '-p' }"#{node['mysql']['server_root_password']}" < "#{grants_path}"]
       action :nothing
       subscribes :run, resources("template[#{grants_path}]"), :immediately
     end
   end
 
+  template "#{node['mysql']['conf_dir']}/my.cnf" do
+    source "my.cnf.erb"
+    owner "root" unless platform? 'windows'
+    group node['mysql']['root_group'] unless platform? 'windows'
+    mode "0644"
+    case node['mysql']['reload_action']
+    when 'restart'
+      notifies :restart, "service[mysql]", :immediately
+    when 'reload'
+      notifies :reload, "service[mysql]", :immediately
+    else
+      Chef::Log.info "my.cnf updated but mysql.reload_action is #{node['mysql']['reload_action']}. No action taken."
+    end
+    variables :skip_federated => skip_federated
+  end
+
   service "mysql" do
     action :start
   end

data/lib/cookbooks/mysql/templates/default/grants.sql.erb

@@ -1,9 +1,9 @@
 # Generated by Chef for <%= node['hostname'] %>.
 # Local modifications will be overwritten.
 
-<% case node['platform'] -%>
-<% when "debian","ubuntu" -%>
-GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT ON *.* TO 'debian-sys-maint'@'localhost' IDENTIFIED BY '<%= node[:mysql][:server_debian_password] %>' WITH GRANT OPTION;
+<% case node['platform_family'] -%>
+<% when "debian" -%>
+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT ON *.* TO 'debian-sys-maint'@'localhost' IDENTIFIED BY '<%= node['mysql']['server_debian_password'] %>' WITH GRANT OPTION;
 <% end -%>
 # Grant replication for a slave user.
 GRANT REPLICATION SLAVE ON *.* TO 'repl'@'%' identified by '<%= node['mysql']['server_repl_password'] %>';

data/lib/cookbooks/mysql/templates/default/my.cnf.erb

@@ -30,7 +30,7 @@ socket          = <%= node['mysql']['socket'] %>
 # This was formally known as [safe_mysqld]. Both versions are currently parsed.
 [mysqld_safe]
 socket          = <%= node['mysql']['socket'] %>
-nice            = 0
+nice            = <%= node['mysql']['nice'] %>
 
 [mysqld]
 #
@@ -49,8 +49,22 @@ socket          = <%= node['mysql']['socket'] %>
 port            = <%= node['mysql']['port'] %>
 basedir         = <%= node['mysql']['basedir'] %>
 datadir         = <%= node['mysql']['data_dir'] %>
-tmpdir          = /tmp
+tmpdir          = <%= node['mysql']['tmpdir'].join(':') %>
 skip-external-locking
+<%- if node['mysql']['tunable']['skip-name-resolve'] %>
+skip-name-resolve
+<%- end %>
+
+# Charset and Collation
+character-set-server = <%= node['mysql']['tunable']['character-set-server'] %>
+collation-server     = <%= node['mysql']['tunable']['collation-server'] %>
+<%- if node['mysql']['tunable']['event_scheduler'] %>
+event_scheduler      = <%= node['mysql']['tunable']['event_scheduler'] %>
+<%- end %>
+<%- if node['mysql']['tunable']['skip-character-set-client-handshake'] %>
+skip-character-set-client-handshake
+<%- end %>
+
 #
 # Instead of skip-networking the default is now to listen only on
 # localhost which is more compatible and is not less secure.
@@ -62,6 +76,10 @@ key_buffer              = <%= node['mysql']['tunable']['key_buffer'] %>
 max_allowed_packet      = <%= node['mysql']['tunable']['max_allowed_packet'] %>
 thread_stack            = <%= node['mysql']['tunable']['thread_stack'] %>
 thread_cache_size       = <%= node['mysql']['tunable']['thread_cache_size'] %>
+sort_buffer_size        = <%= node['mysql']['tunable']['sort_buffer_size'] %>
+read_buffer_size        = <%= node['mysql']['tunable']['read_buffer_size'] %>
+read_rnd_buffer_size    = <%= node['mysql']['tunable']['read_rnd_buffer_size'] %>
+join_buffer_size        = <%= node['mysql']['tunable']['join_buffer_size'] %>
 
 auto-increment-increment = <%= node['mysql']['auto-increment-increment'] %>
 auto-increment-offset    = <%= node['mysql']['auto-increment-offset'] %>
@@ -69,16 +87,28 @@ auto-increment-offset    = <%= node['mysql']['auto-increment-offset'] %>
 # This replaces the startup script and checks MyISAM tables if needed
 # the first time they are touched
 myisam-recover          = BACKUP
-#max_connections        = 100
-#table_cache            = 64
-#thread_concurrency     = 10
 max_connections         = <%= node['mysql']['tunable']['max_connections'] %>
+max_connect_errors      = <%= node['mysql']['tunable']['max_connect_errors'] %>
+concurrent_insert       = <%= node['mysql']['tunable']['concurrent_insert'] %>
+connect_timeout         = <%= node['mysql']['tunable']['connect_timeout'] %>
 wait_timeout            = <%= node['mysql']['tunable']['wait_timeout'] %>
 net_read_timeout        = <%= node['mysql']['tunable']['net_read_timeout'] %>
 net_write_timeout       = <%= node['mysql']['tunable']['net_write_timeout'] %>
 back_log                = <%= node['mysql']['tunable']['back_log'] %>
 table_cache             = <%= node['mysql']['tunable']['table_cache'] %>
+<%- if node['mysql']['tunable']['table_open_cache'] %>
+table_open_cache        = <%= node['mysql']['tunable']['table_open_cache'] %>
+<%- end %>
+tmp_table_size          = <%= node['mysql']['tunable']['tmp_table_size'] %>
 max_heap_table_size     = <%= node['mysql']['tunable']['max_heap_table_size'] %>
+bulk_insert_buffer_size = <%= node['mysql']['tunable']['bulk_insert_buffer_size'] %>
+open-files-limit        = <%= node['mysql']['tunable']['open-files-limit'] %>
+open-files              = <%= node['mysql']['tunable']['open-files'] %>
+
+# Default Table Settings
+<%- if node['mysql']['tunable']['sql_mode'] %>
+sql_mode                = "<%= node['mysql']['tunable']['sql_mode'] %>"
+<%- end %>
 
 #
 # * Query Cache Configuration
@@ -86,7 +116,7 @@ max_heap_table_size     = <%= node['mysql']['tunable']['max_heap_table_size'] %>
 query_cache_limit       = <%= node['mysql']['tunable']['query_cache_limit'] %>
 query_cache_size        = <%= node['mysql']['tunable']['query_cache_size'] %>
 #
-# * Logging and Replication
+# * Logging
 #
 # Both location gets rotated by the cronjob.
 # Be aware that this log type is a performance killer.
@@ -94,22 +124,41 @@ query_cache_size        = <%= node['mysql']['tunable']['query_cache_size'] %>
 #
 # Error logging goes to syslog. This is a Debian improvement :)
 <%- if node['mysql']['tunable']['log_error'] %>
-log-error = <%= node['mysql']['tunable']['log_error'] %>
+log_error = <%= node['mysql']['tunable']['log_error'] %>
+<%- end %>
+<%- if node['mysql']['tunable']['log_warnings'] %>
+log_warnings
 <%- end %>
+#
+# * Replication
+#
+read_only = <%= node['mysql']['read_only'] %>
+
+
 #
 # Here you can see queries with especially long duration
-log_slow_queries        = <%= node['mysql']['tunable']['log_slow_queries'] %>
+<%- if node['mysql']['version'].to_f >= 5.5 %>
+slow_query_log          = <%= node['mysql']['tunable']['slow_query_log'] %>
+<% else %>
+log_slow_queries        = <%= node['mysql']['tunable']['slow_query_log'] %>
+<% end %>
+
 long_query_time         = <%= node['mysql']['tunable']['long_query_time'] %>
-<%- if node['mysql']['tunable']['log_queries_not_using_index'] %>
+<%- if node['mysql']['tunable']['log_queries_not_using_index'] and node['mysql']['slow_query_log']  %>
 log-queries-not-using-indexes
 <%- end %>
 #
 # The following can be used as easy to replay backup logs or for replication.
 # note: if you are setting up a replication slave, see README.Debian about
 #       other settings you may need to change.
-#server-id              = 1
+<%- if node['mysql']['tunable']['server_id'] %>
+server-id = <%= node['mysql']['tunable']['server_id'] %>
+<% end %>
 <%- if node['mysql']['tunable']['log_bin'] %>
 log_bin = <%= node['mysql']['tunable']['log_bin'] %>
+<%- if node['mysql']['tunable']['log_bin'] %>
+binlog_format           = <%= node['mysql']['tunable']['binlog_format'] %>
+<%- end %>
 log_slave_updates       = <%= node['mysql']['tunable']['log_slave_updates'] %>
 <%- end %>
 <%- if node['mysql']['tunable']['log_bin_trust_function_creators'] %>
@@ -117,15 +166,27 @@ log_bin_trust_function_creators
 <%- end %>
 expire_logs_days        = <%= node['mysql']['tunable']['expire_logs_days'] %>
 max_binlog_size         = <%= node['mysql']['tunable']['max_binlog_size'] %>
+binlog_cache_size       = <%= node['mysql']['tunable']['binlog_cache_size'] %>
 #binlog_do_db           = include_database_name
 #binlog_ignore_db       = include_database_name
 <%- if node['mysql']['tunable']['relay_log'] %>
-relay-log               = <%= node['mysql']['tunable']['relay_log'] %>
+relay_log               = <%= node['mysql']['tunable']['relay_log'] %>
+<%- end %>
+<%- if node['mysql']['tunable']['relay_log_index'] %>
+relay_log_index         = <%= node['mysql']['tunable']['relay_log_index'] %>
 <%- end %>
+
 sync_binlog             = <%= node['mysql']['tunable']['sync_binlog'] %>
 <%- if node['mysql']['tunable']['skip_slave_start'] %>
 skip_slave_start
 <%- end %>
+<%- if node['mysql']['tunable']['read_only'] %>
+read_only = 1
+<%- end %>
+
+<%- if node['mysql']['tunable']['transaction-isolation'] %>
+transaction-isolation = <%= node['mysql']['tunable']['transaction-isolation'] %>
+<%- end %>
 
 #
 # * InnoDB
@@ -134,6 +195,36 @@ skip_slave_start
 # Read the manual for more InnoDB related options. There are many!
 # You might want to disable InnoDB to shrink the mysqld process by circa 100MB.
 #skip-innodb
+
+<%- if node["mysql"]["version"].to_f >= 5.5 %>
+innodb_write_io_threads         = <%= node['mysql']['tunable']['innodb_write_io_threads'] %>
+innodb_io_capacity              = <%= node['mysql']['tunable']['innodb_io_capacity'] %>
+innodb_read_io_threads          = <%= node['mysql']['tunable']['innodb_read_io_threads'] %>
+innodb_buffer_pool_instances    = <%= node['mysql']['tunable']['innodb_buffer_pool_instances'] %>     
+<%- end %>
+
+## InnoDB Plugin Independent Settings
+innodb_data_home_dir            = <%= node['mysql']['data_dir']  %>
+innodb_log_group_home_dir       = <%= node['mysql']['log_dir']  %>
+<%- if node['mysql']['log_files_in_group'] %>
+innodb_log_files_in_group       = <%= node['mysql']['log_files_in_group'] %>
+<%- end %>
+
+<%- if node['mysql']['innodb_status_file'] %>
+innodb_status_file
+<%- end %>
+<%- if node['mysql']['tunable']['innodb_file_per_table'] %>
+innodb_file_per_table
+<%- end %>
+innodb_table_locks              = <%= node['mysql']['tunable']['innodb_table_locks'] %>
+innodb_lock_wait_timeout        = <%= node['mysql']['tunable']['innodb_lock_wait_timeout'] %>
+innodb_thread_concurrency       = <%= node['mysql']['tunable']['innodb_thread_concurrency'] %>
+innodb_commit_concurrency       = <%= node['mysql']['tunable']['innodb_commit_concurrency'] %>
+innodb_support_xa               = <%= node['mysql']['tunable']['innodb_support_xa'] %>
+<%- if node['mysql']['tunable']['skip-innodb-doublewrite'] %>
+skip-innodb-doublewrite
+<%- end %>
+
 innodb_buffer_pool_size = <%= node['mysql']['tunable']['innodb_buffer_pool_size'] %>
 innodb_log_file_size    = <%= node['mysql']['tunable']['innodb_log_file_size'] %>
 innodb_additional_mem_pool_size = <%= node['mysql']['tunable']['innodb_additional_mem_pool_size'] %>
@@ -178,7 +269,12 @@ max_allowed_packet      = <%= node['mysql']['tunable']['max_allowed_packet'] %>
 #no-auto-rehash # faster start of mysql but no tab completition
 
 [isamchk]
-key_buffer              = <%= node['mysql']['tunable']['max_allowed_packet'] %>
+key_buffer                = <%= node['mysql']['tunable']['max_allowed_packet'] %>
+
+myisam_sort_buffer_size   = <%= node['mysql']['tunable']['myisam_sort_buffer_size'] %>
+myisam_max_sort_file_size = <%= node['mysql']['tunable']['myisam_max_sort_file_size'] %>
+myisam_repair_threads     = <%= node['mysql']['tunable']['myisam_repair_threads'] %>
+myisam_recover            = <%= node['mysql']['tunable']['myisam_recover'] %>
 
 #
 # * NDB Cluster
@@ -191,8 +287,8 @@ key_buffer              = <%= node['mysql']['tunable']['max_allowed_packet'] %>
 # [MYSQL_CLUSTER]
 # ndb-connectstring=127.0.0.1
 
-<% case node['platform'] -%>
-<% when "centos", "redhat", "fedora", "suse", "scientific", "amazon"-%>
+<% case node['platform_family'] -%>
+<% when "rhel", "fedora", "suse" -%>
 #
 # * BerkeleyDB
 #

data/lib/cookbooks/mysql/test/kitchen/Kitchenfile

@@ -2,4 +2,6 @@ cookbook "mysql" do
   configuration "client"
   configuration "ruby"
   configuration "server"
+  # the syntax in attributes/server.rb#105 is perfectly valid
+  lint(:ignore => ['FC028'])
 end

data/lib/cookbooks/mysql/test/kitchen/cookbooks/mysql_test/metadata.rb

@@ -6,5 +6,4 @@ long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
 version          "0.1.0"
 
 depends          "database"
-depends          "mysql"
 depends          "yum"

data/lib/cookbooks/mysql/test/kitchen/cookbooks/mysql_test/recipes/client.rb

@@ -17,4 +17,4 @@
 # limitations under the License.
 #
 
-include_recipe "yum::epel" if platform?('centos')
+include_recipe "yum::epel" if platform_family?('rhel')

data/lib/cookbooks/mysql/test/kitchen/cookbooks/mysql_test/recipes/server.rb

@@ -17,27 +17,17 @@
 # limitations under the License.
 #
 
-case node.platform
-  when 'ubuntu'
-    %w{mysql-client libmysqlclient-dev}
-  when 'centos'
-    %w{mysql mysql-devel}
-end.each do |pkg|
-  package pkg do
-    action :nothing
-  end.run_action(:install)
-end
-
-gem_package "mysql" do
-  action :nothing
-end.run_action(:install)
+node.set['mysql']['server_debian_password'] = "ilikerandompasswords"
+node.set['mysql']['server_root_password']   = "ilikerandompasswords"
+node.set['mysql']['server_repl_password']   = "ilikerandompasswords"
 
-include_recipe "yum::epel" if platform?('centos')
+include_recipe "mysql::ruby"
+include_recipe "yum::epel" if platform_family?('rhel')
 
 file "/etc/sysconfig/network" do
   content "NETWORKING=yes"
   action :create_if_missing
-  only_if { platform?('amazon', 'centos', 'fedora', 'redhat', 'scientific') }
+  only_if { platform_family?('rhel', 'fedora') }
 end
 
 include_recipe 'mysql::server'

data/lib/cookbooks/mysql/test/kitchen/cookbooks/mysql_test/recipes/setup.rb

@@ -0,0 +1,32 @@
+#
+# Cookbook Name:: mysql_test
+# Recipe:: setup
+#
+# Copyright 2012, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+node.set['rvm']['user_installs'] = [
+  { 'user'          => 'vagrant',
+    'default_ruby'  => 'ruby-1.9.3-p327',
+    'rubies'        => ['1.9.3']
+  }
+]
+
+node.set['rvm']['gems'] = {
+  "ruby-1.9.3-p327" => [
+    { 'name' => 'bundler' }
+  ]
+}
+include_recipe "rvm::user"

data/lib/server_maint/version.rb

@@ -1,3 +1,3 @@
 module ServerMaint
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: server_maint
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -190,6 +190,7 @@ files:
 - lib/cookbooks/mysql/test/kitchen/cookbooks/mysql_test/metadata.rb
 - lib/cookbooks/mysql/test/kitchen/cookbooks/mysql_test/recipes/client.rb
 - lib/cookbooks/mysql/test/kitchen/cookbooks/mysql_test/recipes/server.rb
+- lib/cookbooks/mysql/test/kitchen/cookbooks/mysql_test/recipes/setup.rb
 - lib/cookbooks/nginx/.gitignore
 - lib/cookbooks/nginx/CHANGELOG.md
 - lib/cookbooks/nginx/CONTRIBUTING
@@ -384,7 +385,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1419622192236361235
+      hash: -2491000604656706982
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -393,7 +394,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1419622192236361235
+      hash: -2491000604656706982
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24