Bring mysqld settings for mediawiki machines under chef control

diff --git a/roles/foundation.rb b/roles/foundation.rb
index 22f8dc3eb0f52ee170fc21cf9254b6a0168bdb7e..7d46dc74880856e3996e4ddc0d51c86ee9029b18 100644 (file)
--- a/roles/foundation.rb
+++ b/roles/foundation.rb
@@ -23,6 +23,18 @@ default_attributes(
     :memory_limit => 400,
     :chunk_growth_factor => 1.05,
     :min_item_size => 5
+  },
+  :mysql => {
+    :settings => {
+      :mysqld => {
+        :innodb_buffer_pool_size => "512M",
+        :key_buffer_size => "64M",
+        :max_connections => "200",
+        :query_cache_size => "48M",
+        :sort_buffer_size => "8M",
+        :tmp_table_size => "48M"
+      }
+    }
   }
 )
 

diff --git a/roles/wiki.rb b/roles/wiki.rb
index 4b419aa16920f453665f4344bcfd158354872df0..edb21ab291abd69d798edc7f64c423e2be926c29 100644 (file)
--- a/roles/wiki.rb
+++ b/roles/wiki.rb
@@ -7,6 +7,16 @@ default_attributes(
       :wiki => { :status => :role }
     }
   },
+  :apache => {
+    :mpm => "prefork",
+    :timeout => 30,
+    :event => {
+      :server_limit => 32,
+      :max_request_workers => 800,
+      :threads_per_child => 50,
+      :max_connections_per_child => 10000
+    }
+  },
   :elasticsearch => {
     :version => "2.x",
     :cluster => {
@@ -35,14 +45,16 @@ default_attributes(
     :chunk_growth_factor => 1.05,
     :min_item_size => 5
   },
-  :apache => {
-    :mpm => "prefork",
-    :timeout => 30,
-    :event => {
-      :server_limit => 32,
-      :max_request_workers => 800,
-      :threads_per_child => 50,
-      :max_connections_per_child => 10000
+  :mysql => {
+    :settings => {
+      :mysqld => {
+        :innodb_buffer_pool_size => "4G",
+        :key_buffer_size => "64M",
+        :max_connections => "200",
+        :query_cache_size => "256M",
+        :sort_buffer_size => "8M",
+        :tmp_table_size => "128M"
+      }
     }
   }
 )