Pyoungmeister has submitted this change and it was merged.
Change subject: prelabsdb dbs: redacting tables
......................................................................
prelabsdb dbs: redacting tables
Change-Id: I39ae872cea381b4df22f57ebd75f6a8918e04e00
---
M manifests/realm.pp
M manifests/site.pp
M modules/mysql_multi_instance/manifests/instance.pp
3 files changed, 129 insertions(+), 55 deletions(-)
Approvals:
Pyoungmeister: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/realm.pp b/manifests/realm.pp
index c6cb352..9a826fb 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -97,6 +97,67 @@
'wg_enwiki',
'wikimaniateamwiki', ]
+$private_tables = [ 'arbcom1_vote',
+ 'archive',
+ 'archive_old',
+ 'blob_orphans',
+ 'blob_tracking',
+ 'broken_cu_changes',
+ 'bv2009_edits',
+ 'categorylinks_old',
+ 'click_tracking',
+ 'cu_changes',
+ 'cu_log',
+ 'cur',
+ 'edit_page_tracking',
+ 'email_capture',
+ 'exarchive',
+ 'exrevision',
+ 'filearchive',
+ 'filejournal',
+ 'hidden',
+ 'image_old',
+ 'job',
+ 'linkscc',
+ 'log_search',
+ 'logging_old',
+ 'long_run_profiling',
+ 'moodbar_feedback',
+ 'moodbar_feedback_response',
+ 'objectcache',
+ 'old_growth',
+ 'oldimage_old',
+ 'optin_survey',
+ 'pr_index',
+ 'prefstats',
+ 'prefswitch_survey',
+ 'profiling',
+ 'querycache',
+ 'querycache_info',
+ 'querycache_old',
+ 'querycachetwo',
+ 'securepoll_cookie_match',
+ 'securepoll_elections',
+ 'securepoll_entity',
+ 'securepoll_lists',
+ 'securepoll_msgs',
+ 'securepoll_options',
+ 'securepoll_properties',
+ 'securepoll_questions',
+ 'securepoll_strike',
+ 'securepoll_voters',
+ 'securepoll_votes',
+ 'spoofuser',
+ 'text',
+ 'titlekey',
+ 'transcache',
+ 'uploadstash',
+ 'user_daily_contribs',
+ 'user_newtalk',
+ 'user_properties',
+ 'vote_log',
+ 'watchlist' ]
+
# Route list for mail coming from MediaWiki mailer
$exim_mediawiki_route_list = $::realm ? {
'production' => 'smtp.pmtpa.wmnet',
diff --git a/manifests/site.pp b/manifests/site.pp
index 1da6d2f..cce4ebf 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -641,7 +641,8 @@
's1' => {
'port' => 3306,
'innodb_log_file_size' => "2000M",
- 'ram' => "72G"
+ 'ram' => "72G",
+ 'repl_wild_ignore_tables' => $::private_tables,
},
}
}
@@ -653,17 +654,20 @@
's2' => {
'port' => 3306,
'innodb_log_file_size' => "2000M",
- 'ram' => "24G"
+ 'ram' => "24G",
+ 'repl_wild_ignore_tables' => $::private_tables,
},
's4' => {
'port' => 3307,
'innodb_log_file_size' => "2000M",
- 'ram' => "24G"
+ 'ram' => "24G",
+ 'repl_wild_ignore_tables' => $::private_tables,
},
's5' => {
'port' => 3308,
'innodb_log_file_size' => "1000M",
- 'ram' => "24G"
+ 'ram' => "24G",
+ 'repl_wild_ignore_tables' => $::private_tables,
},
}
}
@@ -677,16 +681,19 @@
'innodb_log_file_size' => "500M",
'ram' => "24G",
'repl_ignore_dbs' => $::private_wikis,
+ 'repl_wild_ignore_tables' => $::private_tables,
},
's6' => {
'port' => 3307,
'innodb_log_file_size' => "500M",
- 'ram' => "24G"
+ 'ram' => "24G",
+ 'repl_wild_ignore_tables' => $::private_tables,
},
's7' => {
'port' => 3308,
'innodb_log_file_size' => "500M",
- 'ram' => "24G"
+ 'ram' => "24G",
+ 'repl_wild_ignore_tables' => $::private_tables,
},
}
}
diff --git a/modules/mysql_multi_instance/manifests/instance.pp
b/modules/mysql_multi_instance/manifests/instance.pp
index ef9c9dd..ae1f921 100644
--- a/modules/mysql_multi_instance/manifests/instance.pp
+++ b/modules/mysql_multi_instance/manifests/instance.pp
@@ -9,6 +9,11 @@
}else {
$repl_ignore_dbs = false
}
+ if has_key( $instances[$name], 'repl_wild_ignore_tables') {
+ $repl_wild_ignore_tables = prefix(
$instances[$name]['repl_wild_ignore_tables'], '%.' )
+ }else {
+ $repl_wild_ignore_tables = false
+ }
$serverid = inline_template("<%= ia = ipaddress.split('.'); server_id =
ia[0] + ia[2] + ia[3] + String($port); server_id %>")
include passwords::nagios::mysql
@@ -55,55 +60,56 @@
'socket' => "/tmp/mysql.sock",
},
'mysqld' => {
- 'server_id' => $serverid,
- 'read_only' => 1,
- 'user' => "mysql",
- 'socket' => "/tmp/mysql.${port}.sock",
- 'port' => $port,
- 'datadir' => "/a/sqldata.${port}/",
- 'tmpdir' => "/a/tmp/",
- 'query_cache_type' => 0,
- 'log_slow_verbosity' => 'Query_plan',
- 'innodb-adaptive-flushing' => 1,
- 'innodb-buffer-pool-size' => $ram,
- 'innodb-flush-method' => "O_DIRECT",
- 'innodb-io-capacity' => 1000,
- 'innodb-log-file-size' => $innodb_log_file_size,
- 'innodb-old-blocks-pct' => 80,
- 'innodb-old-blocks-time' => 1000,
- 'innodb-read-io-threads' => 16,
- 'innodb-thread-concurrency' => 0,
- 'innodb-use-sys-malloc' => true,
- 'innodb-write-io-threads' => 8,
- 'innodb-checksums' =>1,
- 'innodb_file_per_table' => true,
- 'skip-external-locking' => true,
- 'skip-name-resolve' => true,
- 'key_buffer' => 1M,
- 'max_allowed_packet' => "16M",
- 'thread_stack' => "192K",
- 'thread_cache_size' => 300,
- 'max_connections' => 5000,
- 'table_open_cache' => 50000,
- 'table_definition_cache' => 40000,
- 'query_cache_size' => 0,
- 'log_slow_queries' => true,
- 'long_query_time' => 0.45,
- 'log_bin' => true,
- 'log_slave_updates' => true,
- 'sync_binlog' => 1,
- 'binlog_cache_size' => "1M",
- 'max_binlog_size' => "1000M",
- 'binlog_format' => "statement",
- 'expire_logs_days' => 30,
- 'connect_timeout' => 3,
- 'back_log' => 1000,
- 'max_connect_errors' => 1000000000,
- '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\'',
- 'replicate-ignore-db' => $repl_ignore_dbs,
+ 'server_id' => $serverid,
+ 'read_only' => 1,
+ 'user' => "mysql",
+ 'socket' => "/tmp/mysql.${port}.sock",
+ 'port' => $port,
+ 'datadir' => "/a/sqldata.${port}/",
+ 'tmpdir' => "/a/tmp/",
+ 'query_cache_type' => 0,
+ 'log_slow_verbosity' => 'Query_plan',
+ 'innodb-adaptive-flushing' => 1,
+ 'innodb-buffer-pool-size' => $ram,
+ 'innodb-flush-method' => "O_DIRECT",
+ 'innodb-io-capacity' => 1000,
+ 'innodb-log-file-size' => $innodb_log_file_size,
+ 'innodb-old-blocks-pct' => 80,
+ 'innodb-old-blocks-time' => 1000,
+ 'innodb-read-io-threads' => 16,
+ 'innodb-thread-concurrency' => 0,
+ 'innodb-use-sys-malloc' => true,
+ 'innodb-write-io-threads' => 8,
+ 'innodb-checksums' =>1,
+ 'innodb_file_per_table' => true,
+ 'skip-external-locking' => true,
+ 'skip-name-resolve' => true,
+ 'key_buffer' => 1M,
+ 'max_allowed_packet' => "16M",
+ 'thread_stack' => "192K",
+ 'thread_cache_size' => 300,
+ 'max_connections' => 5000,
+ 'table_open_cache' => 50000,
+ 'table_definition_cache' => 40000,
+ 'query_cache_size' => 0,
+ 'log_slow_queries' => true,
+ 'long_query_time' => 0.45,
+ 'log_bin' => true,
+ 'log_slave_updates' => true,
+ 'sync_binlog' => 1,
+ 'binlog_cache_size' => "1M",
+ 'max_binlog_size' => "1000M",
+ 'binlog_format' => "statement",
+ 'expire_logs_days' => 30,
+ 'connect_timeout' => 3,
+ 'back_log' => 1000,
+ 'max_connect_errors' => 1000000000,
+ '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\'',
+ 'replicate-ignore-db' => $repl_ignore_dbs,
+ 'replicate-wild-ignore-table' => $repl_wild_ignore_tables,
},
'mysqldump' => {
'quick' => true,
--
To view, visit https://gerrit.wikimedia.org/r/63924
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I39ae872cea381b4df22f57ebd75f6a8918e04e00
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Pyoungmeister <p...@wikimedia.org>
Gerrit-Reviewer: Asher <afeld...@wikimedia.org>
Gerrit-Reviewer: Pyoungmeister <p...@wikimedia.org>
Gerrit-Reviewer: coren <mpellet...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
