[MediaWiki-commits] [Gerrit] pre-labsdb dbs: more node defs - change (operations/puppet)

[Pyoungmeister (Code Review)]

Pyoungmeister has submitted this change and it was merged.

Change subject: pre-labsdb dbs: more node defs
......................................................................


pre-labsdb dbs: more node defs

and string quoting fix

Change-Id: Ic688969ba11d8c22537a72d1b10a2223781c4c74
---
M manifests/site.pp
M modules/mysql_multi_instance/manifests/instance.pp
2 files changed, 37 insertions(+), 5 deletions(-)

Approvals:
  Pyoungmeister: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/site.pp b/manifests/site.pp
index 3b0b391..24e8b46 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -577,7 +577,15 @@
 
 ## SANITARIUM
 node /^db1053\.eqiad\.wmnet/ {
-
+  class { role::db::sanitarium:
+    instances => {
+      's1' => {
+        'port' => 3306,
+        'innodb_log_file_size' => "2000M",
+        'ram' => "96G"
+      },
+    }
+  }
 }
 
 node /^db1054\.eqiad\.wmnet/ {
@@ -586,21 +594,45 @@
       's2' => {
         'port' => 3306,
         'innodb_log_file_size' => "2000M",
-        'ram' => "20G"
+        'ram' => "32G"
       },
       's4' => {
         'port' => 3307,
         'innodb_log_file_size' => "2000M",
-        'ram' => "20G"
+        'ram' => "32G"
+      },
+      's5' => {
+        'port' => 3308,
+        'innodb_log_file_size' => "1000M",
+        'ram' => "32G"
       },
     }
   }
 }
 
 node /^db1055\.eqiad\.wmnet/ {
-
+  class { role::db::sanitarium:
+    instances => {
+      's3' => {
+        'port' => 3306,
+        'innodb_log_file_size' => "500M",
+        'ram' => "32G"
+      },
+      's6' => {
+        'port' => 3307,
+        'innodb_log_file_size' => "500M",
+        'ram' => "32G"
+      },
+      's7' => {
+        'port' => 3308,
+        'innodb_log_file_size' => "500M",
+        'ram' => "32G"
+      },
+    }
+  }
 }
 
+
 ## not currently in production and/or hardware issues
 node /^db10(1[23456]|2[3]|3[2367]|4[45])\.eqiad\.wmnet/ {
        include standard
diff --git a/modules/mysql_multi_instance/manifests/instance.pp 
b/modules/mysql_multi_instance/manifests/instance.pp
index 99f34f2..62c7cea 100644
--- a/modules/mysql_multi_instance/manifests/instance.pp
+++ b/modules/mysql_multi_instance/manifests/instance.pp
@@ -82,7 +82,7 @@
           'temp-pool'                 => true,
           'query_cache_type'          => 0,
           'log_slow_verbosity'        => "Query_plan",
-          'optimizer_switch'          => 
"'mrr=on,mrr_cost_based=on,mrr_sort_keys=on,optimize_join_buffer_size=on,extended_keys=off'",
+          'optimizer_switch'          => 
'\'mrr=on,mrr_cost_based=on,mrr_sort_keys=on,optimize_join_buffer_size=on,extended_keys=off\'',
         },
         'mysqldump' => {
           'quick'              => true,

-- 
To view, visit https://gerrit.wikimedia.org/r/57095
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic688969ba11d8c22537a72d1b10a2223781c4c74
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Pyoungmeister <p...@wikimedia.org>
Gerrit-Reviewer: Pyoungmeister <p...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits