Permalink
Browse files

Merge branch 'COOK-614'

  • Loading branch information...
schisamo committed Jul 1, 2011
2 parents 1f67d0b + 5c306a2 commit 5e36691ffe5b09e1d7f0e8b306c45e6ca4f1008f
Showing with 10 additions and 7 deletions.
  1. +3 −0 mysql/attributes/server.rb
  2. +7 −7 mysql/templates/default/my.cnf.erb
@@ -62,4 +62,7 @@
default['mysql']['tunable']['log_slow_queries'] = "/var/log/mysql/slow.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']['innodb_buffer_pool_size'] = "256M"
@@ -59,9 +59,9 @@ bind-address = <%= node['mysql']['bind_address'] %>
# * Fine Tuning
#
key_buffer = <%= node['mysql']['tunable']['key_buffer'] %>
-max_allowed_packet = 16M
-thread_stack = 128K
-thread_cache_size = 8
+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'] %>
# This replaces the startup script and checks MyISAM tables if needed
# the first time they are touched
myisam-recover = BACKUP
@@ -100,8 +100,8 @@ log-queries-not-using-indexes
# other settings you may need to change.
#server-id = 1
#log_bin = /var/log/mysql/mysql-bin.log
-expire_logs_days = 10
-max_binlog_size = 100M
+expire_logs_days = <%= node['mysql']['tunable']['expire_logs_days'] %>
+max_binlog_size = <%= node['mysql']['tunable']['max_binlog_size'] %>
#binlog_do_db = include_database_name
#binlog_ignore_db = include_database_name
#
@@ -138,13 +138,13 @@ skip-federated
[mysqldump]
quick
quote-names
-max_allowed_packet = 16M
+max_allowed_packet = <%= node['mysql']['tunable']['max_allowed_packet'] %>
[mysql]
#no-auto-rehash # faster start of mysql but no tab completition
[isamchk]
-key_buffer = 16M
+key_buffer = <%= node['mysql']['tunable']['max_allowed_packet'] %>
#
# * NDB Cluster

0 comments on commit 5e36691

Please sign in to comment.