[MediaWiki-commits] [Gerrit] reduce tendril memory footprint due to OOM, and switch to /srv - change (operations/puppet)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/227641 Change subject: reduce tendril memory footprint due to OOM, and switch to /srv .. reduce tendril memory footprint due to OOM, and switch to /srv Change-Id: Ie69f900ae669c506ce4ebad481d96595936344e8 --- M manifests/role/mariadb.pp M templates/mariadb/tendril.my.cnf.erb 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/41/227641/1 diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp index c0db98b..91e5928 100644 --- a/manifests/role/mariadb.pp +++ b/manifests/role/mariadb.pp @@ -243,8 +243,8 @@ prompt = 'TENDRIL', config = 'mariadb/tendril.my.cnf.erb', password = $passwords::misc::scripts::mysql_root_pass, -datadir = '/a/sqldata', -tmpdir = '/a/tmp', +datadir = '/srv/sqldata', +tmpdir = '/srv/tmp', } } diff --git a/templates/mariadb/tendril.my.cnf.erb b/templates/mariadb/tendril.my.cnf.erb index b213884..3708e7c 100644 --- a/templates/mariadb/tendril.my.cnf.erb +++ b/templates/mariadb/tendril.my.cnf.erb @@ -41,7 +41,7 @@ innodb_flush_log_at_trx_commit = 0 innodb_flush_method= O_DIRECT aria_pagecache_buffer_size = 1G -tokudb_cache_size = 32G +tokudb_cache_size = 24G optimizer_switch='engine_condition_pushdown=on,optimize_join_buffer_size=on' join_cache_level = 8 -- To view, visit https://gerrit.wikimedia.org/r/227641 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie69f900ae669c506ce4ebad481d96595936344e8 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] reduce tendril memory footprint due to OOM, and switch to /srv - change (operations/puppet)
Springle has submitted this change and it was merged. Change subject: reduce tendril memory footprint due to OOM, and switch to /srv .. reduce tendril memory footprint due to OOM, and switch to /srv Change-Id: Ie69f900ae669c506ce4ebad481d96595936344e8 --- M manifests/role/mariadb.pp M templates/mariadb/tendril.my.cnf.erb 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp index c0db98b..91e5928 100644 --- a/manifests/role/mariadb.pp +++ b/manifests/role/mariadb.pp @@ -243,8 +243,8 @@ prompt = 'TENDRIL', config = 'mariadb/tendril.my.cnf.erb', password = $passwords::misc::scripts::mysql_root_pass, -datadir = '/a/sqldata', -tmpdir = '/a/tmp', +datadir = '/srv/sqldata', +tmpdir = '/srv/tmp', } } diff --git a/templates/mariadb/tendril.my.cnf.erb b/templates/mariadb/tendril.my.cnf.erb index b213884..3708e7c 100644 --- a/templates/mariadb/tendril.my.cnf.erb +++ b/templates/mariadb/tendril.my.cnf.erb @@ -41,7 +41,7 @@ innodb_flush_log_at_trx_commit = 0 innodb_flush_method= O_DIRECT aria_pagecache_buffer_size = 1G -tokudb_cache_size = 32G +tokudb_cache_size = 24G optimizer_switch='engine_condition_pushdown=on,optimize_join_buffer_size=on' join_cache_level = 8 -- To view, visit https://gerrit.wikimedia.org/r/227641 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie69f900ae669c506ce4ebad481d96595936344e8 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1070 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/226484 Change subject: repool db1070 .. repool db1070 Change-Id: I41cce28fd282b89b1d182696e7f98e6c901d3b65 --- M wmf-config/db-eqiad.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/84/226484/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index d960e0a..d92a17d 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -128,8 +128,8 @@ 'db1058' = 0, # 2.8TB 96GB 'db1049' = 0, # 1.4TB 64GB, vslow, dump 'db1026' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager - 'db1045' = 100, # 1.4TB 64GB, api - # upgrade 'db1070' = 500, # 2.8TB 160GB + 'db1045' = 0, # 1.4TB 64GB, api + 'db1070' = 500, # 2.8TB 160GB 'db1071' = 500, # 2.8TB 160GB ), 's6' = array( -- To view, visit https://gerrit.wikimedia.org/r/226484 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I41cce28fd282b89b1d182696e7f98e6c901d3b65 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] depool db1070 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/226461 Change subject: depool db1070 .. depool db1070 Change-Id: Ife50f7d937d7d5fcc63042929872646814398972 --- M wmf-config/db-eqiad.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/61/226461/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index d92a17d..d960e0a 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -128,8 +128,8 @@ 'db1058' = 0, # 2.8TB 96GB 'db1049' = 0, # 1.4TB 64GB, vslow, dump 'db1026' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager - 'db1045' = 0, # 1.4TB 64GB, api - 'db1070' = 500, # 2.8TB 160GB + 'db1045' = 100, # 1.4TB 64GB, api + # upgrade 'db1070' = 500, # 2.8TB 160GB 'db1071' = 500, # 2.8TB 160GB ), 's6' = array( -- To view, visit https://gerrit.wikimedia.org/r/226461 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ife50f7d937d7d5fcc63042929872646814398972 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] depool db1071 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/226257 Change subject: depool db1071 .. depool db1071 Change-Id: Ia3d87cae33fa5ec3e10ca0ccdc39e1ef2d65c6bc --- M wmf-config/db-eqiad.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/57/226257/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index d92a17d..0b6854e 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -128,9 +128,9 @@ 'db1058' = 0, # 2.8TB 96GB 'db1049' = 0, # 1.4TB 64GB, vslow, dump 'db1026' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager - 'db1045' = 0, # 1.4TB 64GB, api + 'db1045' = 100, # 1.4TB 64GB, api 'db1070' = 500, # 2.8TB 160GB - 'db1071' = 500, # 2.8TB 160GB + # upgrade 'db1071' = 500, # 2.8TB 160GB ), 's6' = array( 'db1023' = 0, # 1.4TB 64GB -- To view, visit https://gerrit.wikimedia.org/r/226257 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia3d87cae33fa5ec3e10ca0ccdc39e1ef2d65c6bc Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1071 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/226263 Change subject: repool db1071 .. repool db1071 Change-Id: I82b93ca0ab87658abdd118046480c09768907587 --- M wmf-config/db-eqiad.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/63/226263/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 0b6854e..d92a17d 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -128,9 +128,9 @@ 'db1058' = 0, # 2.8TB 96GB 'db1049' = 0, # 1.4TB 64GB, vslow, dump 'db1026' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager - 'db1045' = 100, # 1.4TB 64GB, api + 'db1045' = 0, # 1.4TB 64GB, api 'db1070' = 500, # 2.8TB 160GB - # upgrade 'db1071' = 500, # 2.8TB 160GB + 'db1071' = 500, # 2.8TB 160GB ), 's6' = array( 'db1023' = 0, # 1.4TB 64GB -- To view, visit https://gerrit.wikimedia.org/r/226263 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I82b93ca0ab87658abdd118046480c09768907587 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1030 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/225279 Change subject: repool db1030 .. repool db1030 Change-Id: I04854cd34f74d969f49116fee792bcc7e96eda04 --- M wmf-config/db-eqiad.php 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/79/225279/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 0c5af56..d92a17d 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -134,9 +134,9 @@ ), 's6' = array( 'db1023' = 0, # 1.4TB 64GB - # T105879 'db1022' = 0, # 1.4TB 64GB, vslow, dump - # upgrade 'db1030' = 0, # 1.4TB 64GB - 'db1037' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager, vslow, dump + # T105879 'db1022' = 0, # 1.4TB 64GB + 'db1030' = 0, # 1.4TB 64GB, vslow, dump + 'db1037' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager 'db1050' = 400, # 1.4TB 64GB 'db1061' = 500, # 2.8TB 128GB ), @@ -298,10 +298,10 @@ ), 's6' = array( 'vslow' = array( - 'db1037' = 1, + 'db1030' = 1, ), 'dump' = array( - 'db1037' = 1, + 'db1030' = 1, ), 'watchlist' = array( 'db1037' = 1, -- To view, visit https://gerrit.wikimedia.org/r/225279 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I04854cd34f74d969f49116fee792bcc7e96eda04 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] depool db1022 T105879 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/224783 Change subject: depool db1022 T105879 .. depool db1022 T105879 Change-Id: If58e6a7f9436264a55eaeb64d5bda1602ad09ebf --- M wmf-config/db-eqiad.php 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/83/224783/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 80f419a..0c5af56 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -134,9 +134,9 @@ ), 's6' = array( 'db1023' = 0, # 1.4TB 64GB - 'db1022' = 0, # 1.4TB 64GB, vslow, dump + # T105879 'db1022' = 0, # 1.4TB 64GB, vslow, dump # upgrade 'db1030' = 0, # 1.4TB 64GB - 'db1037' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager + 'db1037' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager, vslow, dump 'db1050' = 400, # 1.4TB 64GB 'db1061' = 500, # 2.8TB 128GB ), @@ -298,10 +298,10 @@ ), 's6' = array( 'vslow' = array( - 'db1022' = 1, + 'db1037' = 1, ), 'dump' = array( - 'db1022' = 1, + 'db1037' = 1, ), 'watchlist' = array( 'db1037' = 1, -- To view, visit https://gerrit.wikimedia.org/r/224783 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If58e6a7f9436264a55eaeb64d5bda1602ad09ebf Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] s6 pager slave partitioning - change (operations/software)
Springle has submitted this change and it was merged. Change subject: s6 pager slave partitioning .. s6 pager slave partitioning Change-Id: I64f7ffa2a985346f5e425299d7d58ce15de48887 --- A dbtools/s6-pager.sql 1 file changed, 155 insertions(+), 0 deletions(-) Approvals: Springle: Verified; Looks good to me, approved diff --git a/dbtools/s6-pager.sql b/dbtools/s6-pager.sql new file mode 100644 index 000..3534cc3 --- /dev/null +++ b/dbtools/s6-pager.sql @@ -0,0 +1,155 @@ +-- frwiki + + select 1 as n, count(rev_user) from frwiki.revision where rev_user 1 +union select 1 as n, count(rev_user) from frwiki.revision where rev_user = 1 and rev_user 1 +union select 2 as n, count(rev_user) from frwiki.revision where rev_user = 1 and rev_user 2 +union select 3 as n, count(rev_user) from frwiki.revision where rev_user = 2 and rev_user 3 +union select 4 as n, count(rev_user) from frwiki.revision where rev_user = 3 and rev_user 4 +union select 5 as n, count(rev_user) from frwiki.revision where rev_user = 4 and rev_user 5 +union select 10 as n, count(rev_user) from frwiki.revision where rev_user = 5 and rev_user 10 +union select 20 as n, count(rev_user) from frwiki.revision where rev_user = 10 and rev_user 20 +union select 30 as n, count(rev_user) from frwiki.revision where rev_user = 20 and rev_user 30 +union select 40 as n, count(rev_user) from frwiki.revision where rev_user = 30 and rev_user 40 +union select 50 as n, count(rev_user) from frwiki.revision where rev_user = 40 and rev_user 50 +union select 100 as n, count(rev_user) from frwiki.revision where rev_user = 50 and rev_user 100 +union select 200 as n, count(rev_user) from frwiki.revision where rev_user = 100 and rev_user 200; + +ALTER TABLE frwiki.logging + DROP PRIMARY KEY, + ADD PRIMARY KEY (log_id, log_user) + PARTITION BY RANGE (log_user) ( + PARTITION p1 VALUES LESS THAN (1), + PARTITION p1 VALUES LESS THAN (1), + PARTITION p2 VALUES LESS THAN (2), + PARTITION p3 VALUES LESS THAN (3), + PARTITION p4 VALUES LESS THAN (4), + PARTITION p5 VALUES LESS THAN (5), + PARTITION p10 VALUES LESS THAN (10), + PARTITION p20 VALUES LESS THAN (20), + PARTITION p30 VALUES LESS THAN (30), + PARTITION p40 VALUES LESS THAN (40), + PARTITION p50 VALUES LESS THAN (50), + PARTITION p100 VALUES LESS THAN (100), + PARTITION pMAXVALUE VALUES LESS THAN MAXVALUE ); + +ALTER TABLE frwiki.revision + DROP PRIMARY KEY, + DROP INDEX rev_id, + ADD PRIMARY KEY (rev_id, rev_user) + PARTITION BY RANGE (rev_user) ( + PARTITION p1 VALUES LESS THAN (1), + PARTITION p1 VALUES LESS THAN (1), + PARTITION p2 VALUES LESS THAN (2), + PARTITION p3 VALUES LESS THAN (3), + PARTITION p4 VALUES LESS THAN (4), + PARTITION p5 VALUES LESS THAN (5), + PARTITION p10 VALUES LESS THAN (10), + PARTITION p20 VALUES LESS THAN (20), + PARTITION p30 VALUES LESS THAN (30), + PARTITION p40 VALUES LESS THAN (40), + PARTITION p50 VALUES LESS THAN (50), + PARTITION p100 VALUES LESS THAN (100), + PARTITION pMAXVALUE VALUES LESS THAN MAXVALUE ); + +-- ruwiki + + select 1 as n, count(rev_user) from ruwiki.revision where rev_user 1 +union select 1 as n, count(rev_user) from ruwiki.revision where rev_user = 1 and rev_user 1 +union select 2 as n, count(rev_user) from ruwiki.revision where rev_user = 1 and rev_user 2 +union select 3 as n, count(rev_user) from ruwiki.revision where rev_user = 2 and rev_user 3 +union select 4 as n, count(rev_user) from ruwiki.revision where rev_user = 3 and rev_user 4 +union select 5 as n, count(rev_user) from ruwiki.revision where rev_user = 4 and rev_user 5 +union select 10 as n, count(rev_user) from ruwiki.revision where rev_user = 5 and rev_user 10 +union select 20 as n, count(rev_user) from ruwiki.revision where rev_user = 10 and rev_user 20 +union select 30 as n, count(rev_user) from ruwiki.revision where rev_user = 20 and rev_user 30 +union select 40 as n, count(rev_user) from ruwiki.revision where rev_user = 30 and rev_user 40 +union select 50 as n, count(rev_user) from ruwiki.revision where rev_user = 40 and rev_user 50 +union select 100 as n, count(rev_user) from ruwiki.revision where rev_user = 50 and rev_user 100 +union select 200 as n, count(rev_user) from ruwiki.revision where rev_user = 100 and rev_user 200; + +ALTER TABLE ruwiki.logging + DROP PRIMARY KEY, + ADD
[MediaWiki-commits] [Gerrit] upgrade db1030 trusty - change (operations/puppet)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/224742 Change subject: upgrade db1030 trusty .. upgrade db1030 trusty Change-Id: I3fc619553d2051b4c6c640a051ec94b297e102e4 --- M manifests/site.pp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/42/224742/1 diff --git a/manifests/site.pp b/manifests/site.pp index ecf78d3..f9210ea 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -558,7 +558,7 @@ } } -node /^db10(23|30)\.eqiad\.wmnet/ { +node /^db10(23)\.eqiad\.wmnet/ { class { 'role::coredb::s6': innodb_file_per_table = true, mariadb = true, @@ -650,7 +650,7 @@ } } -node /^db20(28|39|46|53)\.codfw\.wmnet/ { +node /^db20(28|30|39|46|53)\.codfw\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': -- To view, visit https://gerrit.wikimedia.org/r/224742 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3fc619553d2051b4c6c640a051ec94b297e102e4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] upgrade db1030 trusty - change (operations/puppet)
Springle has submitted this change and it was merged. Change subject: upgrade db1030 trusty .. upgrade db1030 trusty Change-Id: I3fc619553d2051b4c6c640a051ec94b297e102e4 --- M manifests/site.pp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/site.pp b/manifests/site.pp index ecf78d3..f9210ea 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -558,7 +558,7 @@ } } -node /^db10(23|30)\.eqiad\.wmnet/ { +node /^db10(23)\.eqiad\.wmnet/ { class { 'role::coredb::s6': innodb_file_per_table = true, mariadb = true, @@ -650,7 +650,7 @@ } } -node /^db20(28|39|46|53)\.codfw\.wmnet/ { +node /^db20(28|30|39|46|53)\.codfw\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': -- To view, visit https://gerrit.wikimedia.org/r/224742 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3fc619553d2051b4c6c640a051ec94b297e102e4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] move db1030 to correct node definition - change (operations/puppet)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/224744 Change subject: move db1030 to correct node definition .. move db1030 to correct node definition Change-Id: I2695b0b9e992ea053a31c887f0dcdb6b28ed1073 --- M manifests/site.pp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/44/224744/1 diff --git a/manifests/site.pp b/manifests/site.pp index f9210ea..36f3051 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -644,13 +644,13 @@ } } -node /^db10(22|37|50|61)\.eqiad\.wmnet/ { +node /^db10(22|30|37|50|61)\.eqiad\.wmnet/ { class { 'role::mariadb::core': shard = 's6', } } -node /^db20(28|30|39|46|53)\.codfw\.wmnet/ { +node /^db20(28|39|46|53)\.codfw\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': -- To view, visit https://gerrit.wikimedia.org/r/224744 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2695b0b9e992ea053a31c887f0dcdb6b28ed1073 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] move db1030 to correct node definition - change (operations/puppet)
Springle has submitted this change and it was merged. Change subject: move db1030 to correct node definition .. move db1030 to correct node definition Change-Id: I2695b0b9e992ea053a31c887f0dcdb6b28ed1073 --- M manifests/site.pp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/site.pp b/manifests/site.pp index f9210ea..36f3051 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -644,13 +644,13 @@ } } -node /^db10(22|37|50|61)\.eqiad\.wmnet/ { +node /^db10(22|30|37|50|61)\.eqiad\.wmnet/ { class { 'role::mariadb::core': shard = 's6', } } -node /^db20(28|30|39|46|53)\.codfw\.wmnet/ { +node /^db20(28|39|46|53)\.codfw\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': -- To view, visit https://gerrit.wikimedia.org/r/224744 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2695b0b9e992ea053a31c887f0dcdb6b28ed1073 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1037; depool db1030 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/224555 Change subject: repool db1037; depool db1030 .. repool db1037; depool db1030 Change-Id: I9323f8552f486460d2b2b09505a561193c3b --- M wmf-config/db-eqiad.php 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/55/224555/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index c6e46b6..80f419a 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -135,8 +135,8 @@ 's6' = array( 'db1023' = 0, # 1.4TB 64GB 'db1022' = 0, # 1.4TB 64GB, vslow, dump - 'db1030' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager - # partitioning 'db1037' = 0, # 1.4TB 64GB + # upgrade 'db1030' = 0, # 1.4TB 64GB + 'db1037' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager 'db1050' = 400, # 1.4TB 64GB 'db1061' = 500, # 2.8TB 128GB ), @@ -304,19 +304,19 @@ 'db1022' = 1, ), 'watchlist' = array( - 'db1030' = 1, + 'db1037' = 1, ), 'recentchanges' = array( - 'db1030' = 1, + 'db1037' = 1, ), 'recentchangeslinked' = array( - 'db1030' = 1, + 'db1037' = 1, ), 'contributions' = array( - 'db1030' = 1, + 'db1037' = 1, ), 'logpager' = array( - 'db1030' = 1, + 'db1037' = 1, ), ), 's7' = array( -- To view, visit https://gerrit.wikimedia.org/r/224555 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9323f8552f486460d2b2b09505a561193c3b Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add missing mod_rewrite rules - change (operations...tendril)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/224378 Change subject: add missing mod_rewrite rules .. add missing mod_rewrite rules Change-Id: Ifbcf8a2bea9f8485f183ac59d9d0b69f8367c0b7 --- A web/.htaccess 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/tendril refs/changes/78/224378/1 diff --git a/web/.htaccess b/web/.htaccess new file mode 100644 index 000..80dc3da --- /dev/null +++ b/web/.htaccess @@ -0,0 +1,6 @@ +Options +FollowSymLinks + +RewriteEngine on +RewriteCond %{REQUEST_FILENAME} !-f +RewriteCond %{REQUEST_FILENAME} !-d +RewriteRule ^.*$ /index.php [NC,L,QSA] \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/224378 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifbcf8a2bea9f8485f183ac59d9d0b69f8367c0b7 Gerrit-PatchSet: 1 Gerrit-Project: operations/software/tendril Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert repool db1037 as s6 logpager; depool db1030. - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/224015 Change subject: Revert repool db1037 as s6 logpager; depool db1030. .. Revert repool db1037 as s6 logpager; depool db1030. Query plans broke. This reverts commit 8cf12daa71887be5cdb36a86ef88cb301aadc316. Change-Id: I7ea5e9840427b26d7ed3799a51d474c5dcf93212 --- M wmf-config/db-eqiad.php 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/15/224015/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 80f419a..c6e46b6 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -135,8 +135,8 @@ 's6' = array( 'db1023' = 0, # 1.4TB 64GB 'db1022' = 0, # 1.4TB 64GB, vslow, dump - # upgrade 'db1030' = 0, # 1.4TB 64GB - 'db1037' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager + 'db1030' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager + # partitioning 'db1037' = 0, # 1.4TB 64GB 'db1050' = 400, # 1.4TB 64GB 'db1061' = 500, # 2.8TB 128GB ), @@ -304,19 +304,19 @@ 'db1022' = 1, ), 'watchlist' = array( - 'db1037' = 1, + 'db1030' = 1, ), 'recentchanges' = array( - 'db1037' = 1, + 'db1030' = 1, ), 'recentchangeslinked' = array( - 'db1037' = 1, + 'db1030' = 1, ), 'contributions' = array( - 'db1037' = 1, + 'db1030' = 1, ), 'logpager' = array( - 'db1037' = 1, + 'db1030' = 1, ), ), 's7' = array( -- To view, visit https://gerrit.wikimedia.org/r/224015 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7ea5e9840427b26d7ed3799a51d474c5dcf93212 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1037 as s6 logpager; depool db1030 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/224014 Change subject: repool db1037 as s6 logpager; depool db1030 .. repool db1037 as s6 logpager; depool db1030 Change-Id: I9b16ebe019619d34827870543b9f7ff22866e76c --- M wmf-config/db-eqiad.php 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/14/224014/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index c6e46b6..80f419a 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -135,8 +135,8 @@ 's6' = array( 'db1023' = 0, # 1.4TB 64GB 'db1022' = 0, # 1.4TB 64GB, vslow, dump - 'db1030' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager - # partitioning 'db1037' = 0, # 1.4TB 64GB + # upgrade 'db1030' = 0, # 1.4TB 64GB + 'db1037' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager 'db1050' = 400, # 1.4TB 64GB 'db1061' = 500, # 2.8TB 128GB ), @@ -304,19 +304,19 @@ 'db1022' = 1, ), 'watchlist' = array( - 'db1030' = 1, + 'db1037' = 1, ), 'recentchanges' = array( - 'db1030' = 1, + 'db1037' = 1, ), 'recentchangeslinked' = array( - 'db1030' = 1, + 'db1037' = 1, ), 'contributions' = array( - 'db1030' = 1, + 'db1037' = 1, ), 'logpager' = array( - 'db1030' = 1, + 'db1037' = 1, ), ), 's7' = array( -- To view, visit https://gerrit.wikimedia.org/r/224014 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9b16ebe019619d34827870543b9f7ff22866e76c Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] s7 pager slave partitioning - change (operations/software)
Springle has submitted this change and it was merged. Change subject: s7 pager slave partitioning .. s7 pager slave partitioning Change-Id: I7f72c828fa87491c040ef73739f9f4e2adb4ac57 --- A dbtools/s7-pager.sql 1 file changed, 310 insertions(+), 0 deletions(-) Approvals: Springle: Verified; Looks good to me, approved diff --git a/dbtools/s7-pager.sql b/dbtools/s7-pager.sql new file mode 100644 index 000..d0e3219 --- /dev/null +++ b/dbtools/s7-pager.sql @@ -0,0 +1,310 @@ +-- arwiki + + select 1 as n, count(rev_user) from arwiki.revision where rev_user 1 +union select 10 as n, count(rev_user) from arwiki.revision where rev_user = 1 and rev_user 10 +union select 15 as n, count(rev_user) from arwiki.revision where rev_user = 10 and rev_user 15 +union select 25 as n, count(rev_user) from arwiki.revision where rev_user = 15 and rev_user 25 +union select 100 as n, count(rev_user) from arwiki.revision where rev_user = 25 and rev_user 100 +union select 200 as n, count(rev_user) from arwiki.revision where rev_user = 100 and rev_user 200; + +ALTER TABLE arwiki.logging + DROP PRIMARY KEY, + ADD PRIMARY KEY (log_id, log_user) + PARTITION BY RANGE (log_user) ( + PARTITION p1 VALUES LESS THAN (1), + PARTITION p10 VALUES LESS THAN (10), + PARTITION p15 VALUES LESS THAN (15), + PARTITION p25 VALUES LESS THAN (25), + PARTITION p100 VALUES LESS THAN (100), + PARTITION pMAXVALUE VALUES LESS THAN MAXVALUE ); + +ALTER TABLE arwiki.revision + DROP PRIMARY KEY, + DROP INDEX rev_id, + ADD PRIMARY KEY (rev_id, rev_user) + PARTITION BY RANGE (rev_user) ( + PARTITION p1 VALUES LESS THAN (1), + PARTITION p10 VALUES LESS THAN (10), + PARTITION p15 VALUES LESS THAN (15), + PARTITION p25 VALUES LESS THAN (25), + PARTITION p100 VALUES LESS THAN (100), + PARTITION pMAXVALUE VALUES LESS THAN MAXVALUE ); + +-- cawiki + + select 1 as n, count(rev_user) from cawiki.revision where rev_user 1 +union select 1 as n, count(rev_user) from cawiki.revision where rev_user = 1 and rev_user 1 +union select 100 as n, count(rev_user) from cawiki.revision where rev_user = 1 and rev_user 100; + +ALTER TABLE cawiki.logging + DROP PRIMARY KEY, + ADD PRIMARY KEY (log_id, log_user) + PARTITION BY RANGE (log_user) ( + PARTITION p1 VALUES LESS THAN (1), + PARTITION p1 VALUES LESS THAN (1), + PARTITION p100 VALUES LESS THAN (100), + PARTITION pMAXVALUE VALUES LESS THAN MAXVALUE ); + +ALTER TABLE cawiki.revision + DROP PRIMARY KEY, + DROP INDEX rev_id, + ADD PRIMARY KEY (rev_id, rev_user) + PARTITION BY RANGE (rev_user) ( + PARTITION p1 VALUES LESS THAN (1), + PARTITION p1 VALUES LESS THAN (1), + PARTITION p100 VALUES LESS THAN (100), + PARTITION pMAXVALUE VALUES LESS THAN MAXVALUE ); + +-- eswiki + + select 1 as n, count(rev_user) from eswiki.revision where rev_user 1 +union select 1 as n, count(rev_user) from eswiki.revision where rev_user = 1 and rev_user 1 +union select 10 as n, count(rev_user) from eswiki.revision where rev_user = 1 and rev_user 10 +union select 20 as n, count(rev_user) from eswiki.revision where rev_user = 10 and rev_user 20 +union select 30 as n, count(rev_user) from eswiki.revision where rev_user = 20 and rev_user 30 +union select 40 as n, count(rev_user) from eswiki.revision where rev_user = 30 and rev_user 40 +union select 50 as n, count(rev_user) from eswiki.revision where rev_user = 40 and rev_user 50 +union select 100 as n, count(rev_user) from eswiki.revision where rev_user = 50 and rev_user 100 +union select 200 as n, count(rev_user) from eswiki.revision where rev_user = 100 and rev_user 200 +union select 300 as n, count(rev_user) from eswiki.revision where rev_user = 200 and rev_user 300; + +ALTER TABLE eswiki.logging + DROP PRIMARY KEY, + ADD PRIMARY KEY (log_id, log_user) + PARTITION BY RANGE (log_user) ( + PARTITION p1 VALUES LESS THAN (1), + PARTITION p1 VALUES LESS THAN (1), + PARTITION p10 VALUES LESS THAN (10), + PARTITION p20 VALUES LESS THAN (20), + PARTITION p30 VALUES LESS THAN (30), + PARTITION p40 VALUES LESS THAN (40), + PARTITION p50 VALUES LESS THAN (50), + PARTITION p100 VALUES LESS THAN (100), + PARTITION p200 VALUES LESS THAN (200), + PARTITION p300 VALUES LESS THAN (300), + PARTITION pMAXVALUE VALUES LESS THAN MAXVALUE ); + +ALTER TABLE eswiki.revision + DROP PRIMARY KEY, + DROP INDEX rev_id, + ADD PRIMARY KEY (rev_id, rev_user) + PARTITION BY RANGE (rev_user) ( + PARTITION p1 VALUES LESS THAN (1), + PARTITION p1 VALUES
[MediaWiki-commits] [Gerrit] s6 pager slave partitioning - change (operations/software)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/223732 Change subject: s6 pager slave partitioning .. s6 pager slave partitioning Change-Id: I64f7ffa2a985346f5e425299d7d58ce15de48887 --- A dbtools/s6-pager.sql 1 file changed, 155 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software refs/changes/32/223732/1 diff --git a/dbtools/s6-pager.sql b/dbtools/s6-pager.sql new file mode 100644 index 000..3534cc3 --- /dev/null +++ b/dbtools/s6-pager.sql @@ -0,0 +1,155 @@ +-- frwiki + + select 1 as n, count(rev_user) from frwiki.revision where rev_user 1 +union select 1 as n, count(rev_user) from frwiki.revision where rev_user = 1 and rev_user 1 +union select 2 as n, count(rev_user) from frwiki.revision where rev_user = 1 and rev_user 2 +union select 3 as n, count(rev_user) from frwiki.revision where rev_user = 2 and rev_user 3 +union select 4 as n, count(rev_user) from frwiki.revision where rev_user = 3 and rev_user 4 +union select 5 as n, count(rev_user) from frwiki.revision where rev_user = 4 and rev_user 5 +union select 10 as n, count(rev_user) from frwiki.revision where rev_user = 5 and rev_user 10 +union select 20 as n, count(rev_user) from frwiki.revision where rev_user = 10 and rev_user 20 +union select 30 as n, count(rev_user) from frwiki.revision where rev_user = 20 and rev_user 30 +union select 40 as n, count(rev_user) from frwiki.revision where rev_user = 30 and rev_user 40 +union select 50 as n, count(rev_user) from frwiki.revision where rev_user = 40 and rev_user 50 +union select 100 as n, count(rev_user) from frwiki.revision where rev_user = 50 and rev_user 100 +union select 200 as n, count(rev_user) from frwiki.revision where rev_user = 100 and rev_user 200; + +ALTER TABLE frwiki.logging + DROP PRIMARY KEY, + ADD PRIMARY KEY (log_id, log_user) + PARTITION BY RANGE (log_user) ( + PARTITION p1 VALUES LESS THAN (1), + PARTITION p1 VALUES LESS THAN (1), + PARTITION p2 VALUES LESS THAN (2), + PARTITION p3 VALUES LESS THAN (3), + PARTITION p4 VALUES LESS THAN (4), + PARTITION p5 VALUES LESS THAN (5), + PARTITION p10 VALUES LESS THAN (10), + PARTITION p20 VALUES LESS THAN (20), + PARTITION p30 VALUES LESS THAN (30), + PARTITION p40 VALUES LESS THAN (40), + PARTITION p50 VALUES LESS THAN (50), + PARTITION p100 VALUES LESS THAN (100), + PARTITION pMAXVALUE VALUES LESS THAN MAXVALUE ); + +ALTER TABLE frwiki.revision + DROP PRIMARY KEY, + DROP INDEX rev_id, + ADD PRIMARY KEY (rev_id, rev_user) + PARTITION BY RANGE (rev_user) ( + PARTITION p1 VALUES LESS THAN (1), + PARTITION p1 VALUES LESS THAN (1), + PARTITION p2 VALUES LESS THAN (2), + PARTITION p3 VALUES LESS THAN (3), + PARTITION p4 VALUES LESS THAN (4), + PARTITION p5 VALUES LESS THAN (5), + PARTITION p10 VALUES LESS THAN (10), + PARTITION p20 VALUES LESS THAN (20), + PARTITION p30 VALUES LESS THAN (30), + PARTITION p40 VALUES LESS THAN (40), + PARTITION p50 VALUES LESS THAN (50), + PARTITION p100 VALUES LESS THAN (100), + PARTITION pMAXVALUE VALUES LESS THAN MAXVALUE ); + +-- ruwiki + + select 1 as n, count(rev_user) from ruwiki.revision where rev_user 1 +union select 1 as n, count(rev_user) from ruwiki.revision where rev_user = 1 and rev_user 1 +union select 2 as n, count(rev_user) from ruwiki.revision where rev_user = 1 and rev_user 2 +union select 3 as n, count(rev_user) from ruwiki.revision where rev_user = 2 and rev_user 3 +union select 4 as n, count(rev_user) from ruwiki.revision where rev_user = 3 and rev_user 4 +union select 5 as n, count(rev_user) from ruwiki.revision where rev_user = 4 and rev_user 5 +union select 10 as n, count(rev_user) from ruwiki.revision where rev_user = 5 and rev_user 10 +union select 20 as n, count(rev_user) from ruwiki.revision where rev_user = 10 and rev_user 20 +union select 30 as n, count(rev_user) from ruwiki.revision where rev_user = 20 and rev_user 30 +union select 40 as n, count(rev_user) from ruwiki.revision where rev_user = 30 and rev_user 40 +union select 50 as n, count(rev_user) from ruwiki.revision where rev_user = 40 and rev_user 50 +union select 100 as n, count(rev_user) from ruwiki.revision where rev_user = 50 and rev_user 100 +union select 200 as n, count(rev_user) from ruwiki.revision where rev_user = 100 and rev_user
[MediaWiki-commits] [Gerrit] depool db1037 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/223710 Change subject: depool db1037 .. depool db1037 Change-Id: Ia63aca74d320fe89e6b26b1b4a3e16d2b40b2ee1 --- M wmf-config/db-eqiad.php 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/10/223710/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 5b85c8d..c6e46b6 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -134,10 +134,10 @@ ), 's6' = array( 'db1023' = 0, # 1.4TB 64GB - 'db1022' = 10, # 1.4TB 64GB, (testing after maintenance) + 'db1022' = 0, # 1.4TB 64GB, vslow, dump 'db1030' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager + # partitioning 'db1037' = 0, # 1.4TB 64GB 'db1050' = 400, # 1.4TB 64GB - 'db1037' = 0, # 1.4TB 64GB, vslow, dump (while 1022 test) 'db1061' = 500, # 2.8TB 128GB ), 's7' = array( @@ -298,10 +298,10 @@ ), 's6' = array( 'vslow' = array( - 'db1037' = 1, + 'db1022' = 1, ), 'dump' = array( - 'db1037' = 1, + 'db1022' = 1, ), 'watchlist' = array( 'db1030' = 1, -- To view, visit https://gerrit.wikimedia.org/r/223710 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia63aca74d320fe89e6b26b1b4a3e16d2b40b2ee1 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1041 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/223505 Change subject: repool db1041 .. repool db1041 Change-Id: Id6a1c1198d99e643cd986880dba0e03469c07b8e --- M wmf-config/db-eqiad.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/05/223505/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 3fe38b1..5b85c8d 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -144,8 +144,8 @@ 'db1033' = 0, # 1.4TB 64GB, 'db1028' = 0, # 1.4TB 64GB, vslow, dump 'db1034' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager - # upgrade 'db1041' = 0, # 1.4TB 64GB - 'db1039' = 400, # 1.4TB 64GB + 'db1041' = 300, # 1.4TB 64GB + 'db1039' = 300, # 1.4TB 64GB 'db1062' = 500, # 2.8TB 128GB ), 'silver' = array( -- To view, visit https://gerrit.wikimedia.org/r/223505 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id6a1c1198d99e643cd986880dba0e03469c07b8e Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] upgrade db1041 to trusty + mariadb 10 - change (operations/puppet)
Springle has submitted this change and it was merged. Change subject: upgrade db1041 to trusty + mariadb 10 .. upgrade db1041 to trusty + mariadb 10 Change-Id: Iffae73963fe5fd69577ae83e95f8e06277d06ec0 --- M manifests/site.pp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/site.pp b/manifests/site.pp index edb59a5..e80801d 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -556,7 +556,7 @@ } } -node /^db10(33|41)\.eqiad\.wmnet/ { +node /^db10(33)\.eqiad\.wmnet/ { class { 'role::coredb::s7': innodb_file_per_table = true, mariadb = true, @@ -649,7 +649,7 @@ } } -node /^db10(28|34|39|62)\.eqiad\.wmnet/ { +node /^db10(28|34|39|41|62)\.eqiad\.wmnet/ { class { 'role::mariadb::core': shard = 's7', } -- To view, visit https://gerrit.wikimedia.org/r/223216 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iffae73963fe5fd69577ae83e95f8e06277d06ec0 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] upgrade db1041 to trusty + mariadb 10 - change (operations/puppet)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/223216 Change subject: upgrade db1041 to trusty + mariadb 10 .. upgrade db1041 to trusty + mariadb 10 Change-Id: Iffae73963fe5fd69577ae83e95f8e06277d06ec0 --- M manifests/site.pp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/16/223216/1 diff --git a/manifests/site.pp b/manifests/site.pp index edb59a5..e80801d 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -556,7 +556,7 @@ } } -node /^db10(33|41)\.eqiad\.wmnet/ { +node /^db10(33)\.eqiad\.wmnet/ { class { 'role::coredb::s7': innodb_file_per_table = true, mariadb = true, @@ -649,7 +649,7 @@ } } -node /^db10(28|34|39|62)\.eqiad\.wmnet/ { +node /^db10(28|34|39|41|62)\.eqiad\.wmnet/ { class { 'role::mariadb::core': shard = 's7', } -- To view, visit https://gerrit.wikimedia.org/r/223216 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iffae73963fe5fd69577ae83e95f8e06277d06ec0 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1034; depool db1041 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/222989 Change subject: repool db1034; depool db1041 .. repool db1034; depool db1041 Change-Id: Ieb3b47bea0ff592525ba61706ebf160619de93cb --- M wmf-config/db-eqiad.php 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/89/222989/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 9c25020..ec70213 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -143,8 +143,8 @@ 's7' = array( 'db1033' = 0, # 1.4TB 64GB, 'db1028' = 0, # 1.4TB 64GB, vslow, dump - 'db1041' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager - # upgrade 'db1034' = 400, # 1.4TB 64GB + 'db1034' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager + # upgrade 'db1041' = 0, # 1.4TB 64GB 'db1039' = 400, # 1.4TB 64GB 'db1062' = 500, # 2.8TB 128GB ), @@ -327,19 +327,19 @@ 'db1028' = 1, ), 'watchlist' = array( - 'db1041' = 1, + 'db1034' = 1, ), 'recentchanges' = array( - 'db1041' = 1, + 'db1034' = 1, ), 'recentchangeslinked' = array( - 'db1041' = 1, + 'db1034' = 1, ), 'contributions' = array( - 'db1041' = 1, + 'db1034' = 1, ), 'logpager' = array( - 'db1041' = 1, + 'db1034' = 1, ), ), ), -- To view, visit https://gerrit.wikimedia.org/r/222989 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieb3b47bea0ff592525ba61706ebf160619de93cb Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] s7 pager slave partitioning - change (operations/software)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/222538 Change subject: s7 pager slave partitioning .. s7 pager slave partitioning Change-Id: I7f72c828fa87491c040ef73739f9f4e2adb4ac57 --- A dbtools/s7-pager.sql 1 file changed, 310 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software refs/changes/38/222538/1 diff --git a/dbtools/s7-pager.sql b/dbtools/s7-pager.sql new file mode 100644 index 000..d0e3219 --- /dev/null +++ b/dbtools/s7-pager.sql @@ -0,0 +1,310 @@ +-- arwiki + + select 1 as n, count(rev_user) from arwiki.revision where rev_user 1 +union select 10 as n, count(rev_user) from arwiki.revision where rev_user = 1 and rev_user 10 +union select 15 as n, count(rev_user) from arwiki.revision where rev_user = 10 and rev_user 15 +union select 25 as n, count(rev_user) from arwiki.revision where rev_user = 15 and rev_user 25 +union select 100 as n, count(rev_user) from arwiki.revision where rev_user = 25 and rev_user 100 +union select 200 as n, count(rev_user) from arwiki.revision where rev_user = 100 and rev_user 200; + +ALTER TABLE arwiki.logging + DROP PRIMARY KEY, + ADD PRIMARY KEY (log_id, log_user) + PARTITION BY RANGE (log_user) ( + PARTITION p1 VALUES LESS THAN (1), + PARTITION p10 VALUES LESS THAN (10), + PARTITION p15 VALUES LESS THAN (15), + PARTITION p25 VALUES LESS THAN (25), + PARTITION p100 VALUES LESS THAN (100), + PARTITION pMAXVALUE VALUES LESS THAN MAXVALUE ); + +ALTER TABLE arwiki.revision + DROP PRIMARY KEY, + DROP INDEX rev_id, + ADD PRIMARY KEY (rev_id, rev_user) + PARTITION BY RANGE (rev_user) ( + PARTITION p1 VALUES LESS THAN (1), + PARTITION p10 VALUES LESS THAN (10), + PARTITION p15 VALUES LESS THAN (15), + PARTITION p25 VALUES LESS THAN (25), + PARTITION p100 VALUES LESS THAN (100), + PARTITION pMAXVALUE VALUES LESS THAN MAXVALUE ); + +-- cawiki + + select 1 as n, count(rev_user) from cawiki.revision where rev_user 1 +union select 1 as n, count(rev_user) from cawiki.revision where rev_user = 1 and rev_user 1 +union select 100 as n, count(rev_user) from cawiki.revision where rev_user = 1 and rev_user 100; + +ALTER TABLE cawiki.logging + DROP PRIMARY KEY, + ADD PRIMARY KEY (log_id, log_user) + PARTITION BY RANGE (log_user) ( + PARTITION p1 VALUES LESS THAN (1), + PARTITION p1 VALUES LESS THAN (1), + PARTITION p100 VALUES LESS THAN (100), + PARTITION pMAXVALUE VALUES LESS THAN MAXVALUE ); + +ALTER TABLE cawiki.revision + DROP PRIMARY KEY, + DROP INDEX rev_id, + ADD PRIMARY KEY (rev_id, rev_user) + PARTITION BY RANGE (rev_user) ( + PARTITION p1 VALUES LESS THAN (1), + PARTITION p1 VALUES LESS THAN (1), + PARTITION p100 VALUES LESS THAN (100), + PARTITION pMAXVALUE VALUES LESS THAN MAXVALUE ); + +-- eswiki + + select 1 as n, count(rev_user) from eswiki.revision where rev_user 1 +union select 1 as n, count(rev_user) from eswiki.revision where rev_user = 1 and rev_user 1 +union select 10 as n, count(rev_user) from eswiki.revision where rev_user = 1 and rev_user 10 +union select 20 as n, count(rev_user) from eswiki.revision where rev_user = 10 and rev_user 20 +union select 30 as n, count(rev_user) from eswiki.revision where rev_user = 20 and rev_user 30 +union select 40 as n, count(rev_user) from eswiki.revision where rev_user = 30 and rev_user 40 +union select 50 as n, count(rev_user) from eswiki.revision where rev_user = 40 and rev_user 50 +union select 100 as n, count(rev_user) from eswiki.revision where rev_user = 50 and rev_user 100 +union select 200 as n, count(rev_user) from eswiki.revision where rev_user = 100 and rev_user 200 +union select 300 as n, count(rev_user) from eswiki.revision where rev_user = 200 and rev_user 300; + +ALTER TABLE eswiki.logging + DROP PRIMARY KEY, + ADD PRIMARY KEY (log_id, log_user) + PARTITION BY RANGE (log_user) ( + PARTITION p1 VALUES LESS THAN (1), + PARTITION p1 VALUES LESS THAN (1), + PARTITION p10 VALUES LESS THAN (10), + PARTITION p20 VALUES LESS THAN (20), + PARTITION p30 VALUES LESS THAN (30), + PARTITION p40 VALUES LESS THAN (40), + PARTITION p50 VALUES LESS THAN (50), + PARTITION p100 VALUES LESS THAN (100), + PARTITION p200 VALUES LESS THAN (200), + PARTITION p300 VALUES LESS THAN (300), + PARTITION pMAXVALUE VALUES LESS THAN MAXVALUE ); + +ALTER TABLE eswiki.revision + DROP PRIMARY KEY, + DROP INDEX rev_id, + ADD PRIMARY KEY (rev_id, rev_user) + PARTITION BY RANGE (rev_user) ( +
[MediaWiki-commits] [Gerrit] upgrade db1034 - change (operations/puppet)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/222053 Change subject: upgrade db1034 .. upgrade db1034 Change-Id: I79c6188c47d61416f9407dc83d17d401cb759102 --- M manifests/site.pp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/53/222053/1 diff --git a/manifests/site.pp b/manifests/site.pp index 4138ca4..df7e197 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -560,7 +560,7 @@ } } -node /^db10(33|34|41)\.eqiad\.wmnet/ { +node /^db10(33|41)\.eqiad\.wmnet/ { class { 'role::coredb::s7': innodb_file_per_table = true, mariadb = true, @@ -653,7 +653,7 @@ } } -node /^db10(28|39|62)\.eqiad\.wmnet/ { +node /^db10(28|34|39|62)\.eqiad\.wmnet/ { class { 'role::mariadb::core': shard = 's7', } -- To view, visit https://gerrit.wikimedia.org/r/222053 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I79c6188c47d61416f9407dc83d17d401cb759102 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] upgrade db1034 - change (operations/puppet)
Springle has submitted this change and it was merged. Change subject: upgrade db1034 .. upgrade db1034 Change-Id: I79c6188c47d61416f9407dc83d17d401cb759102 --- M manifests/site.pp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/site.pp b/manifests/site.pp index 4138ca4..df7e197 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -560,7 +560,7 @@ } } -node /^db10(33|34|41)\.eqiad\.wmnet/ { +node /^db10(33|41)\.eqiad\.wmnet/ { class { 'role::coredb::s7': innodb_file_per_table = true, mariadb = true, @@ -653,7 +653,7 @@ } } -node /^db10(28|39|62)\.eqiad\.wmnet/ { +node /^db10(28|34|39|62)\.eqiad\.wmnet/ { class { 'role::mariadb::core': shard = 's7', } -- To view, visit https://gerrit.wikimedia.org/r/222053 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I79c6188c47d61416f9407dc83d17d401cb759102 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] eventlogging purge no longer on m2-master - change (operations/software)
Springle has submitted this change and it was merged. Change subject: eventlogging purge no longer on m2-master .. eventlogging purge no longer on m2-master Also, make it operate outside replication as events firing on master and all slaves, beacause lag is prohibitive. Change-Id: Iee7f50376f78c9326172c3db28f522519d6dbdfd --- R dbtools/events_eventlogging.sql 1 file changed, 6 insertions(+), 49 deletions(-) Approvals: Jcrespo: Looks good to me, but someone else must approve Springle: Verified; Looks good to me, approved diff --git a/dbtools/events_m2_master.sql b/dbtools/events_eventlogging.sql similarity index 65% rename from dbtools/events_m2_master.sql rename to dbtools/events_eventlogging.sql index 412c17b..f6b828f 100644 --- a/dbtools/events_m2_master.sql +++ b/dbtools/events_eventlogging.sql @@ -1,4 +1,4 @@ --- Events for m2-master +-- Events for all eventlogging boxes set @cache_sql_log_bin := @@session.sql_log_bin; set @@session.sql_log_bin = 0; @@ -6,48 +6,13 @@ set @cache_event_scheduler := @@global.event_scheduler; set @@global.event_scheduler = 0; --- Eventlogging - use log; -drop table if exists purge_schedule; -create table purge_schedule ( +create table if not exists purge_schedule ( table_name varchar(100) not null primary key, after_days int unsigned default null, before_stamp varbinary(14) default null, batch_size int unsigned default 1 -) engine=innodb default charset=binary; - -insert into purge_schedule (table_name, after_days) values -('MediaViewer_6054199', 40), -('MediaViewer_6055641', 40), -('MediaViewer_6066908', 40), -('MediaViewer_6636420', 40), -('MediaViewer_7670440', 40), -('MediaViewer_8245578', 40), -('MediaViewer_8572637', 40), -('MediaViewer_8935662', 40), -('MediaViewer_9792855', 40), -('MediaViewer_9989959', 40), -('MultimediaViewerAttribution_9758179', 40), -('MultimediaViewerDimensions_10014238', 40), -('MultimediaViewerDuration_8318615', 40), -('MultimediaViewerDuration_8572641', 40), -('MultimediaViewerNetworkPerformance_7393226', 40), -('MultimediaViewerNetworkPerformance_7488625', 40), -('MultimediaViewerNetworkPerformance_7917896', 40) -; - -insert into purge_schedule (table_name, before_stamp) values -('MobileWebClickTracking_5929948', '2014010100') -; - -drop table if exists event_log; -create table event_log ( - stamp datetime not null, - event varchar(100) not null, - content varchar(1024) not null, - index stamp (stamp) ) engine=innodb default charset=binary; delimiter ;; @@ -56,7 +21,7 @@ create event delete_schedule -on schedule every 10 second starts date(now()) +on schedule every 30 second starts date(now()) do begin @@ -89,16 +54,12 @@ set @sql := concat( ' delete from ', table_name, ' where timestamp ', @stamp, '' -' order by timestamp, id limit ', batch_size +' order by timestamp limit ', batch_size ); prepare stmt from @sql; -set @@session.sql_log_bin = 1; execute stmt; -set @@session.sql_log_bin = 0; deallocate prepare stmt; --- set @@session.sql_log_bin = 0; --- insert into event_log values (now(), 'del', @sql); end if; @@ -120,7 +81,7 @@ create event delete_schedule2 -on schedule every 10 second starts date(now()) +on schedule every 30 second starts date(now()) do begin @@ -149,16 +110,12 @@ set @sql := concat( ' delete from ', table_name, ' where timestamp ', before_stamp, '' -' order by timestamp, id limit ', batch_size +' order by timestamp limit ', batch_size ); prepare stmt from @sql; -set @@session.sql_log_bin = 1; execute stmt; -set @@session.sql_log_bin = 0; deallocate prepare stmt; --- set @@session.sql_log_bin = 0; --- insert into event_log values (now(), 'del', @sql); end if; -- To view, visit https://gerrit.wikimedia.org/r/221561 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iee7f50376f78c9326172c3db28f522519d6dbdfd Gerrit-PatchSet: 1 Gerrit-Project: operations/software Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Jcrespo jcre...@wikimedia.org Gerrit-Reviewer: Mforns mfo...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org ___
[MediaWiki-commits] [Gerrit] depool db1034 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/221830 Change subject: depool db1034 .. depool db1034 Change-Id: Ibfb97292ff4fad60241cc8a6de25a0373431e08f --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/30/221830/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 1824b33..fbc05a7 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -144,7 +144,7 @@ 'db1033' = 0, # 1.4TB 64GB, 'db1028' = 0, # 1.4TB 64GB, vslow, dump 'db1041' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager - 'db1034' = 400, # 1.4TB 64GB + # upgrade 'db1034' = 400, # 1.4TB 64GB 'db1039' = 400, # 1.4TB 64GB 'db1062' = 500, # 2.8TB 128GB ), -- To view, visit https://gerrit.wikimedia.org/r/221830 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibfb97292ff4fad60241cc8a6de25a0373431e08f Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] eventlogging purge no longer on m2-master - change (operations/software)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/221561 Change subject: eventlogging purge no longer on m2-master .. eventlogging purge no longer on m2-master Also, make it operate outside replication as events firing on master and all slaves, beacause lag is prohibitive. Change-Id: Iee7f50376f78c9326172c3db28f522519d6dbdfd --- R dbtools/events_eventlogging.sql 1 file changed, 6 insertions(+), 49 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software refs/changes/61/221561/1 diff --git a/dbtools/events_m2_master.sql b/dbtools/events_eventlogging.sql similarity index 65% rename from dbtools/events_m2_master.sql rename to dbtools/events_eventlogging.sql index 412c17b..f6b828f 100644 --- a/dbtools/events_m2_master.sql +++ b/dbtools/events_eventlogging.sql @@ -1,4 +1,4 @@ --- Events for m2-master +-- Events for all eventlogging boxes set @cache_sql_log_bin := @@session.sql_log_bin; set @@session.sql_log_bin = 0; @@ -6,48 +6,13 @@ set @cache_event_scheduler := @@global.event_scheduler; set @@global.event_scheduler = 0; --- Eventlogging - use log; -drop table if exists purge_schedule; -create table purge_schedule ( +create table if not exists purge_schedule ( table_name varchar(100) not null primary key, after_days int unsigned default null, before_stamp varbinary(14) default null, batch_size int unsigned default 1 -) engine=innodb default charset=binary; - -insert into purge_schedule (table_name, after_days) values -('MediaViewer_6054199', 40), -('MediaViewer_6055641', 40), -('MediaViewer_6066908', 40), -('MediaViewer_6636420', 40), -('MediaViewer_7670440', 40), -('MediaViewer_8245578', 40), -('MediaViewer_8572637', 40), -('MediaViewer_8935662', 40), -('MediaViewer_9792855', 40), -('MediaViewer_9989959', 40), -('MultimediaViewerAttribution_9758179', 40), -('MultimediaViewerDimensions_10014238', 40), -('MultimediaViewerDuration_8318615', 40), -('MultimediaViewerDuration_8572641', 40), -('MultimediaViewerNetworkPerformance_7393226', 40), -('MultimediaViewerNetworkPerformance_7488625', 40), -('MultimediaViewerNetworkPerformance_7917896', 40) -; - -insert into purge_schedule (table_name, before_stamp) values -('MobileWebClickTracking_5929948', '2014010100') -; - -drop table if exists event_log; -create table event_log ( - stamp datetime not null, - event varchar(100) not null, - content varchar(1024) not null, - index stamp (stamp) ) engine=innodb default charset=binary; delimiter ;; @@ -56,7 +21,7 @@ create event delete_schedule -on schedule every 10 second starts date(now()) +on schedule every 30 second starts date(now()) do begin @@ -89,16 +54,12 @@ set @sql := concat( ' delete from ', table_name, ' where timestamp ', @stamp, '' -' order by timestamp, id limit ', batch_size +' order by timestamp limit ', batch_size ); prepare stmt from @sql; -set @@session.sql_log_bin = 1; execute stmt; -set @@session.sql_log_bin = 0; deallocate prepare stmt; --- set @@session.sql_log_bin = 0; --- insert into event_log values (now(), 'del', @sql); end if; @@ -120,7 +81,7 @@ create event delete_schedule2 -on schedule every 10 second starts date(now()) +on schedule every 30 second starts date(now()) do begin @@ -149,16 +110,12 @@ set @sql := concat( ' delete from ', table_name, ' where timestamp ', before_stamp, '' -' order by timestamp, id limit ', batch_size +' order by timestamp limit ', batch_size ); prepare stmt from @sql; -set @@session.sql_log_bin = 1; execute stmt; -set @@session.sql_log_bin = 0; deallocate prepare stmt; --- set @@session.sql_log_bin = 0; --- insert into event_log values (now(), 'del', @sql); end if; -- To view, visit https://gerrit.wikimedia.org/r/221561 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iee7f50376f78c9326172c3db28f522519d6dbdfd Gerrit-PatchSet: 1 Gerrit-Project: operations/software Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1045 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/220397 Change subject: repool db1045 .. repool db1045 Change-Id: Id2a51bef705feb3fc9c8a75e4bf0bf4039ff22a2 --- M wmf-config/db-eqiad.php 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/97/220397/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 39a10b5..f4333e4 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -126,9 +126,9 @@ ), 's5' = array( 'db1058' = 0, # 2.8TB 96GB - 'db1049' = 0, # 1.4TB 64GB, vslow, dump, api - # reassign 'db1045' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager (to be reassigned) + 'db1049' = 0, # 1.4TB 64GB, vslow, dump 'db1026' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager + 'db1045' = 0, # 1.4TB 64GB, api 'db1070' = 500, # 2.8TB 160GB 'db1071' = 500, # 2.8TB 160GB ), @@ -278,7 +278,7 @@ 'db1049' = 1, ), 'api' = array( - 'db1049' = 1, + 'db1045' = 1, ), 'watchlist' = array( 'db1026' = 1, -- To view, visit https://gerrit.wikimedia.org/r/220397 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id2a51bef705feb3fc9c8a75e4bf0bf4039ff22a2 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1073 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/218610 Change subject: repool db1073 .. repool db1073 Change-Id: I069fd36bf92c775352e18938843c0c19863b5921 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/10/218610/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 7a763e9..36e58fb 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -96,7 +96,7 @@ 'db1065' = 100, # 2.8TB 160GB, api 'db1066' = 100, # 2.8TB 160GB, api 'db1072' = 500, # 2.8TB 160GB - # maintenance 'db1073' = 500, # 2.8TB 160GB + 'db1073' = 500, # 2.8TB 160GB ), 's2' = array( 'db1024' = 0, # 1.4TB 64GB -- To view, visit https://gerrit.wikimedia.org/r/218610 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I069fd36bf92c775352e18938843c0c19863b5921 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] depool db1073 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/218582 Change subject: depool db1073 .. depool db1073 Change-Id: I823397f353e648de8e364504d849549416d72265 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/82/218582/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 4b4c0f3..4a6d295 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -96,7 +96,7 @@ 'db1065' = 100, # 2.8TB 160GB, api 'db1066' = 100, # 2.8TB 160GB, api 'db1072' = 500, # 2.8TB 160GB - 'db1073' = 500, # 2.8TB 160GB + # maintenance 'db1073' = 500, # 2.8TB 160GB ), 's2' = array( 'db1024' = 0, # 1.4TB 64GB -- To view, visit https://gerrit.wikimedia.org/r/218582 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I823397f353e648de8e364504d849549416d72265 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1057 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/218566 Change subject: repool db1057 .. repool db1057 Change-Id: I7a1e1da8a3dc95f6939896c1f339960054eef6eb --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/66/218566/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index d5a26cf..4b4c0f3 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -92,7 +92,7 @@ 'db1051' = 0, # 2.8TB 96GB, vslow, dump 'db1055' = 0, # 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1053' = 200, # 2.8TB 96GB - # maintenance 'db1057' = 200, # 2.8TB 96GB + 'db1057' = 200, # 2.8TB 96GB 'db1065' = 100, # 2.8TB 160GB, api 'db1066' = 100, # 2.8TB 160GB, api 'db1072' = 500, # 2.8TB 160GB -- To view, visit https://gerrit.wikimedia.org/r/218566 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7a1e1da8a3dc95f6939896c1f339960054eef6eb Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] depool db1057, take #2 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/218290 Change subject: depool db1057, take #2 .. depool db1057, take #2 Change-Id: I35fef5a3b9898ba2af9525812b43c8af1960a630 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/90/218290/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 4b4c0f3..d5a26cf 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -92,7 +92,7 @@ 'db1051' = 0, # 2.8TB 96GB, vslow, dump 'db1055' = 0, # 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1053' = 200, # 2.8TB 96GB - 'db1057' = 200, # 2.8TB 96GB + # maintenance 'db1057' = 200, # 2.8TB 96GB 'db1065' = 100, # 2.8TB 160GB, api 'db1066' = 100, # 2.8TB 160GB, api 'db1072' = 500, # 2.8TB 160GB -- To view, visit https://gerrit.wikimedia.org/r/218290 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I35fef5a3b9898ba2af9525812b43c8af1960a630 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1057 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/217449 Change subject: repool db1057 .. repool db1057 Change-Id: Iad70cce43dad4f3fde00b77b95b4cb11acde71ad --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/49/217449/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 5928a51..4b4c0f3 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -92,7 +92,7 @@ 'db1051' = 0, # 2.8TB 96GB, vslow, dump 'db1055' = 0, # 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1053' = 200, # 2.8TB 96GB - # minatenance 'db1057' = 200, # 2.8TB 96GB + 'db1057' = 200, # 2.8TB 96GB 'db1065' = 100, # 2.8TB 160GB, api 'db1066' = 100, # 2.8TB 160GB, api 'db1072' = 500, # 2.8TB 160GB -- To view, visit https://gerrit.wikimedia.org/r/217449 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iad70cce43dad4f3fde00b77b95b4cb11acde71ad Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] s5 pager slave partitioning - change (operations/software)
Springle has submitted this change and it was merged. Change subject: s5 pager slave partitioning .. s5 pager slave partitioning Change-Id: If8243abe23fb175866f524bf39adf547fc67df3e --- A dbtools/s5-pager.sql 1 file changed, 80 insertions(+), 0 deletions(-) Approvals: Jcrespo: Looks good to me, but someone else must approve Springle: Verified; Looks good to me, approved diff --git a/dbtools/s5-pager.sql b/dbtools/s5-pager.sql new file mode 100644 index 000..9e3671d --- /dev/null +++ b/dbtools/s5-pager.sql @@ -0,0 +1,80 @@ +-- dewiki + + select 1 as n, count(rev_user) from dewiki.revision where rev_user 1 +union select 1 as n, count(rev_user) from dewiki.revision where rev_user = 1 and rev_user 1 +union select 2 as n, count(rev_user) from dewiki.revision where rev_user = 1 and rev_user 2 +union select 3 as n, count(rev_user) from dewiki.revision where rev_user = 2 and rev_user 3 +union select 10 as n, count(rev_user) from dewiki.revision where rev_user = 3 and rev_user 10 +union select 20 as n, count(rev_user) from dewiki.revision where rev_user = 10 and rev_user 20 +union select 30 as n, count(rev_user) from dewiki.revision where rev_user = 20 and rev_user 30 +union select 100 as n, count(rev_user) from dewiki.revision where rev_user = 30 and rev_user 100 +union select 200 as n, count(rev_user) from dewiki.revision where rev_user = 100 and rev_user 200; + +ALTER TABLE dewiki.logging + DROP PRIMARY KEY, + ADD PRIMARY KEY (log_id, log_user) + PARTITION BY RANGE (log_user) ( + PARTITION p1 VALUES LESS THAN (1), + PARTITION p1 VALUES LESS THAN (1), + PARTITION p2 VALUES LESS THAN (2), + PARTITION p5 VALUES LESS THAN (3), + PARTITION p10 VALUES LESS THAN (10), + PARTITION p20 VALUES LESS THAN (20), + PARTITION p30 VALUES LESS THAN (30), + PARTITION p100 VALUES LESS THAN (100), + PARTITION pMAXVALUE VALUES LESS THAN MAXVALUE ); + +ALTER TABLE dewiki.revision + DROP PRIMARY KEY, + DROP INDEX rev_id, + ADD PRIMARY KEY (rev_id, rev_user) + PARTITION BY RANGE (rev_user) ( + PARTITION p1 VALUES LESS THAN (1), + PARTITION p1 VALUES LESS THAN (1), + PARTITION p2 VALUES LESS THAN (2), + PARTITION p5 VALUES LESS THAN (5), + PARTITION p10 VALUES LESS THAN (10), + PARTITION p20 VALUES LESS THAN (20), + PARTITION p30 VALUES LESS THAN (30), + PARTITION p100 VALUES LESS THAN (100), + PARTITION pMAXVALUE VALUES LESS THAN MAXVALUE ); + +-- wikidatawiki + + select 1 as n, count(rev_user) from wikidatawiki.revision where rev_user 1 +union select 1 as n, count(rev_user) from wikidatawiki.revision where rev_user = 1 and rev_user 1 +union select 2 as n, count(rev_user) from wikidatawiki.revision where rev_user = 1 and rev_user 2 +union select 3 as n, count(rev_user) from wikidatawiki.revision where rev_user = 2 and rev_user 3 +union select 10 as n, count(rev_user) from wikidatawiki.revision where rev_user = 3 and rev_user 10 +union select 20 as n, count(rev_user) from wikidatawiki.revision where rev_user = 10 and rev_user 20 +union select 30 as n, count(rev_user) from wikidatawiki.revision where rev_user = 20 and rev_user 30 +union select 100 as n, count(rev_user) from wikidatawiki.revision where rev_user = 30 and rev_user 100 +union select 200 as n, count(rev_user) from wikidatawiki.revision where rev_user = 100 and rev_user 200; + +ALTER TABLE wikidatawiki.logging + DROP PRIMARY KEY, + ADD PRIMARY KEY (log_id, log_user) + PARTITION BY RANGE (log_user) ( + PARTITION p1 VALUES LESS THAN (1), + PARTITION p1 VALUES LESS THAN (1), + PARTITION p2 VALUES LESS THAN (2), + PARTITION p3 VALUES LESS THAN (3), + PARTITION p10 VALUES LESS THAN (10), + PARTITION p20 VALUES LESS THAN (20), + PARTITION p30 VALUES LESS THAN (30), + PARTITION p100 VALUES LESS THAN (100), + PARTITION pMAXVALUE VALUES LESS THAN MAXVALUE ); + +ALTER TABLE wikidatawiki.revision + DROP PRIMARY KEY, + ADD PRIMARY KEY (rev_id, rev_user) + PARTITION BY RANGE (rev_user) ( + PARTITION p1 VALUES LESS THAN (1), + PARTITION p1 VALUES LESS THAN (1), + PARTITION p2 VALUES LESS THAN (2), + PARTITION p3 VALUES LESS THAN (3), + PARTITION p10 VALUES LESS THAN (10), + PARTITION p20 VALUES LESS THAN (20), + PARTITION p30 VALUES LESS THAN (30), + PARTITION p100 VALUES LESS THAN (100), + PARTITION pMAXVALUE VALUES LESS THAN MAXVALUE ); \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/215567 To unsubscribe, visit
[MediaWiki-commits] [Gerrit] m4 replication rule for analytics-store - change (operations/puppet)
Springle has submitted this change and it was merged. Change subject: m4 replication rule for analytics-store .. m4 replication rule for analytics-store This used to happen, then switched to an out-of-band replication approach due to lag issues. With the change to TokuDB, plus the batched-inserts work done to eventlogging consumer earlier this year, we can switch back. Change-Id: I117ea89dc2c7491d7db9797e72c261f41a0e74f3 --- M templates/mariadb/dbstore.my.cnf.erb 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jcrespo: Looks good to me, but someone else must approve Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/mariadb/dbstore.my.cnf.erb b/templates/mariadb/dbstore.my.cnf.erb index 62d454b..6690532 100644 --- a/templates/mariadb/dbstore.my.cnf.erb +++ b/templates/mariadb/dbstore.my.cnf.erb @@ -71,6 +71,7 @@ s6.replicate-wild-do-table = %wik%.% s7.replicate-wild-do-table = %wik%.%,centralauth.% m3.replicate-wild-do-table = phab%.%,phlegal%.% +m4.replicate-wild-do-table = log.% [mysqldump] -- To view, visit https://gerrit.wikimedia.org/r/215566 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I117ea89dc2c7491d7db9797e72c261f41a0e74f3 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Jcrespo jcre...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] depool db1057 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/217204 Change subject: depool db1057 .. depool db1057 Change-Id: Ic67dee5edd083136870175e319c8c8898f983979 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/04/217204/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 4b4c0f3..5928a51 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -92,7 +92,7 @@ 'db1051' = 0, # 2.8TB 96GB, vslow, dump 'db1055' = 0, # 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1053' = 200, # 2.8TB 96GB - 'db1057' = 200, # 2.8TB 96GB + # minatenance 'db1057' = 200, # 2.8TB 96GB 'db1065' = 100, # 2.8TB 160GB, api 'db1066' = 100, # 2.8TB 160GB, api 'db1072' = 500, # 2.8TB 160GB -- To view, visit https://gerrit.wikimedia.org/r/217204 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic67dee5edd083136870175e319c8c8898f983979 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1073 - change (operations/mediawiki-config)
Springle has submitted this change and it was merged. Change subject: repool db1073 .. repool db1073 Change-Id: Ia050f587ddfdad85ef90ff249a0271dd0cf2a13e --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Springle: Verified; Looks good to me, approved diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 91376d2..b1b4665 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -96,7 +96,7 @@ 'db1065' = 100, # 2.8TB 160GB, api 'db1066' = 100, # 2.8TB 160GB, api 'db1072' = 500, # 2.8TB 160GB - # maintenance 'db1073' = 500, # 2.8TB 160GB + 'db1073' = 500, # 2.8TB 160GB ), 's2' = array( 'db1024' = 0, # 1.4TB 64GB -- To view, visit https://gerrit.wikimedia.org/r/216521 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia050f587ddfdad85ef90ff249a0271dd0cf2a13e Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1073 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/216521 Change subject: repool db1073 .. repool db1073 Change-Id: Ia050f587ddfdad85ef90ff249a0271dd0cf2a13e --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/21/216521/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 91376d2..b1b4665 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -96,7 +96,7 @@ 'db1065' = 100, # 2.8TB 160GB, api 'db1066' = 100, # 2.8TB 160GB, api 'db1072' = 500, # 2.8TB 160GB - # maintenance 'db1073' = 500, # 2.8TB 160GB + 'db1073' = 500, # 2.8TB 160GB ), 's2' = array( 'db1024' = 0, # 1.4TB 64GB -- To view, visit https://gerrit.wikimedia.org/r/216521 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia050f587ddfdad85ef90ff249a0271dd0cf2a13e Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] depool db1073 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/216027 Change subject: depool db1073 .. depool db1073 Change-Id: I6848719eb8c43dd479e60a68416a5b913c82abb4 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/27/216027/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index ed42086..9a305ed 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -96,7 +96,7 @@ 'db1065' = 100, # 2.8TB 160GB, api 'db1066' = 100, # 2.8TB 160GB, api 'db1072' = 500, # 2.8TB 160GB - 'db1073' = 500, # 2.8TB 160GB + # maintenance 'db1073' = 500, # 2.8TB 160GB ), 's2' = array( 'db1024' = 0, # 1.4TB 64GB -- To view, visit https://gerrit.wikimedia.org/r/216027 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6848719eb8c43dd479e60a68416a5b913c82abb4 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1072 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/215890 Change subject: repool db1072 .. repool db1072 Change-Id: I83200e8bacd7674f17387f627bbf59af917ae1c0 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/90/215890/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index fd3014c..8efcddc 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -95,7 +95,7 @@ 'db1057' = 200, # 2.8TB 96GB 'db1065' = 100, # 2.8TB 160GB, api 'db1066' = 100, # 2.8TB 160GB, api - # maintenance 'db1072' = 500, # 2.8TB 160GB + 'db1072' = 500, # 2.8TB 160GB 'db1073' = 500, # 2.8TB 160GB ), 's2' = array( -- To view, visit https://gerrit.wikimedia.org/r/215890 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I83200e8bacd7674f17387f627bbf59af917ae1c0 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] m4 replication rule for analytics-store - change (operations/puppet)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/215566 Change subject: m4 replication rule for analytics-store .. m4 replication rule for analytics-store This used to happen, then switched to an out-of-band replication approach due to lag issues. With the change to TokuDB, plus the batched-inserts work done to eventlogging consumer earlier this year, we can switch back. Change-Id: I117ea89dc2c7491d7db9797e72c261f41a0e74f3 --- M templates/mariadb/dbstore.my.cnf.erb 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/66/215566/1 diff --git a/templates/mariadb/dbstore.my.cnf.erb b/templates/mariadb/dbstore.my.cnf.erb index 62d454b..6690532 100644 --- a/templates/mariadb/dbstore.my.cnf.erb +++ b/templates/mariadb/dbstore.my.cnf.erb @@ -71,6 +71,7 @@ s6.replicate-wild-do-table = %wik%.% s7.replicate-wild-do-table = %wik%.%,centralauth.% m3.replicate-wild-do-table = phab%.%,phlegal%.% +m4.replicate-wild-do-table = log.% [mysqldump] -- To view, visit https://gerrit.wikimedia.org/r/215566 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I117ea89dc2c7491d7db9797e72c261f41a0e74f3 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] s5 pager slave partitioning - change (operations/software)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/215567 Change subject: s5 pager slave partitioning .. s5 pager slave partitioning Change-Id: If8243abe23fb175866f524bf39adf547fc67df3e --- A dbtools/s5-pager.sql 1 file changed, 80 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software refs/changes/67/215567/1 diff --git a/dbtools/s5-pager.sql b/dbtools/s5-pager.sql new file mode 100644 index 000..9e3671d --- /dev/null +++ b/dbtools/s5-pager.sql @@ -0,0 +1,80 @@ +-- dewiki + + select 1 as n, count(rev_user) from dewiki.revision where rev_user 1 +union select 1 as n, count(rev_user) from dewiki.revision where rev_user = 1 and rev_user 1 +union select 2 as n, count(rev_user) from dewiki.revision where rev_user = 1 and rev_user 2 +union select 3 as n, count(rev_user) from dewiki.revision where rev_user = 2 and rev_user 3 +union select 10 as n, count(rev_user) from dewiki.revision where rev_user = 3 and rev_user 10 +union select 20 as n, count(rev_user) from dewiki.revision where rev_user = 10 and rev_user 20 +union select 30 as n, count(rev_user) from dewiki.revision where rev_user = 20 and rev_user 30 +union select 100 as n, count(rev_user) from dewiki.revision where rev_user = 30 and rev_user 100 +union select 200 as n, count(rev_user) from dewiki.revision where rev_user = 100 and rev_user 200; + +ALTER TABLE dewiki.logging + DROP PRIMARY KEY, + ADD PRIMARY KEY (log_id, log_user) + PARTITION BY RANGE (log_user) ( + PARTITION p1 VALUES LESS THAN (1), + PARTITION p1 VALUES LESS THAN (1), + PARTITION p2 VALUES LESS THAN (2), + PARTITION p5 VALUES LESS THAN (3), + PARTITION p10 VALUES LESS THAN (10), + PARTITION p20 VALUES LESS THAN (20), + PARTITION p30 VALUES LESS THAN (30), + PARTITION p100 VALUES LESS THAN (100), + PARTITION pMAXVALUE VALUES LESS THAN MAXVALUE ); + +ALTER TABLE dewiki.revision + DROP PRIMARY KEY, + DROP INDEX rev_id, + ADD PRIMARY KEY (rev_id, rev_user) + PARTITION BY RANGE (rev_user) ( + PARTITION p1 VALUES LESS THAN (1), + PARTITION p1 VALUES LESS THAN (1), + PARTITION p2 VALUES LESS THAN (2), + PARTITION p5 VALUES LESS THAN (5), + PARTITION p10 VALUES LESS THAN (10), + PARTITION p20 VALUES LESS THAN (20), + PARTITION p30 VALUES LESS THAN (30), + PARTITION p100 VALUES LESS THAN (100), + PARTITION pMAXVALUE VALUES LESS THAN MAXVALUE ); + +-- wikidatawiki + + select 1 as n, count(rev_user) from wikidatawiki.revision where rev_user 1 +union select 1 as n, count(rev_user) from wikidatawiki.revision where rev_user = 1 and rev_user 1 +union select 2 as n, count(rev_user) from wikidatawiki.revision where rev_user = 1 and rev_user 2 +union select 3 as n, count(rev_user) from wikidatawiki.revision where rev_user = 2 and rev_user 3 +union select 10 as n, count(rev_user) from wikidatawiki.revision where rev_user = 3 and rev_user 10 +union select 20 as n, count(rev_user) from wikidatawiki.revision where rev_user = 10 and rev_user 20 +union select 30 as n, count(rev_user) from wikidatawiki.revision where rev_user = 20 and rev_user 30 +union select 100 as n, count(rev_user) from wikidatawiki.revision where rev_user = 30 and rev_user 100 +union select 200 as n, count(rev_user) from wikidatawiki.revision where rev_user = 100 and rev_user 200; + +ALTER TABLE wikidatawiki.logging + DROP PRIMARY KEY, + ADD PRIMARY KEY (log_id, log_user) + PARTITION BY RANGE (log_user) ( + PARTITION p1 VALUES LESS THAN (1), + PARTITION p1 VALUES LESS THAN (1), + PARTITION p2 VALUES LESS THAN (2), + PARTITION p3 VALUES LESS THAN (3), + PARTITION p10 VALUES LESS THAN (10), + PARTITION p20 VALUES LESS THAN (20), + PARTITION p30 VALUES LESS THAN (30), + PARTITION p100 VALUES LESS THAN (100), + PARTITION pMAXVALUE VALUES LESS THAN MAXVALUE ); + +ALTER TABLE wikidatawiki.revision + DROP PRIMARY KEY, + ADD PRIMARY KEY (rev_id, rev_user) + PARTITION BY RANGE (rev_user) ( + PARTITION p1 VALUES LESS THAN (1), + PARTITION p1 VALUES LESS THAN (1), + PARTITION p2 VALUES LESS THAN (2), + PARTITION p3 VALUES LESS THAN (3), + PARTITION p10 VALUES LESS THAN (10), + PARTITION p20 VALUES LESS THAN (20), + PARTITION p30 VALUES LESS THAN (30), + PARTITION p100 VALUES LESS THAN (100), + PARTITION pMAXVALUE VALUES LESS THAN MAXVALUE ); \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/215567 To unsubscribe, visit
[MediaWiki-commits] [Gerrit] depool db1072 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/215569 Change subject: depool db1072 .. depool db1072 Change-Id: I5ed8bbd228bc5ceacf37df26bb383f284980e495 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/69/215569/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 8efcddc..fd3014c 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -95,7 +95,7 @@ 'db1057' = 200, # 2.8TB 96GB 'db1065' = 100, # 2.8TB 160GB, api 'db1066' = 100, # 2.8TB 160GB, api - 'db1072' = 500, # 2.8TB 160GB + # maintenance 'db1072' = 500, # 2.8TB 160GB 'db1073' = 500, # 2.8TB 160GB ), 's2' = array( -- To view, visit https://gerrit.wikimedia.org/r/215569 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5ed8bbd228bc5ceacf37df26bb383f284980e495 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] parsercache has no master; every box needs to be writeable - change (operations/puppet)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/214287 Change subject: parsercache has no master; every box needs to be writeable .. parsercache has no master; every box needs to be writeable Change-Id: Id52b3da0f10df908502dc63ced3590d72d96a659 --- M templates/mariadb/parsercache.my.cnf.erb 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/87/214287/1 diff --git a/templates/mariadb/parsercache.my.cnf.erb b/templates/mariadb/parsercache.my.cnf.erb index f8f8e38..165cb21 100644 --- a/templates/mariadb/parsercache.my.cnf.erb +++ b/templates/mariadb/parsercache.my.cnf.erb @@ -15,9 +15,8 @@ tmpdir = %= @tmpdir % server_id = %= @server_id % -# Always start in read_only mode. -# Master selection will be handled by cluster control. -read_only = on +# Parsercache needs to be writeable (no masters). +read_only = off log_bin log_slave_updates -- To view, visit https://gerrit.wikimedia.org/r/214287 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id52b3da0f10df908502dc63ced3590d72d96a659 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1026 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/213772 Change subject: repool db1026 .. repool db1026 Change-Id: If66b23955e9ce7acdeb72a4280c1fa9044ced124 --- M wmf-config/db-eqiad.php 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/72/213772/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 911f264..8efcddc 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -127,8 +127,8 @@ 's5' = array( 'db1058' = 0, # 2.8TB 96GB 'db1049' = 0, # 1.4TB 64GB, vslow, dump, api - 'db1045' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager - # upgrade 'db1026' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager + 'db1045' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager (to be reassigned) + 'db1026' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager 'db1070' = 500, # 2.8TB 160GB 'db1071' = 500, # 2.8TB 160GB ), @@ -282,18 +282,23 @@ ), 'watchlist' = array( 'db1045' = 1, + 'db1026' = 1, ), 'recentchanges' = array( 'db1045' = 1, + 'db1026' = 1, ), 'recentchangeslinked' = array( 'db1045' = 1, + 'db1026' = 1, ), 'contributions' = array( 'db1045' = 1, + 'db1026' = 1, ), 'logpager' = array( 'db1045' = 1, + 'db1026' = 1, ), ), 's6' = array( -- To view, visit https://gerrit.wikimedia.org/r/213772 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If66b23955e9ce7acdeb72a4280c1fa9044ced124 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] upgrade db1026 trusty mariadb 10 - change (operations/puppet)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/212747 Change subject: upgrade db1026 trusty mariadb 10 .. upgrade db1026 trusty mariadb 10 Change-Id: Ic16bc4ad85e402186913e2d8f398c0c018184870 --- M manifests/site.pp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/47/212747/1 diff --git a/manifests/site.pp b/manifests/site.pp index 37b95db..e6044ec 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -535,7 +535,7 @@ } } -node /^db10(26|58)\.eqiad\.wmnet/ { +node /^db10(58)\.eqiad\.wmnet/ { $cluster = 'mysql' class { 'role::coredb::s5': @@ -628,7 +628,7 @@ } } -node /^db10(45|49|70|71)\.eqiad\.wmnet/ { +node /^db10(26|45|49|70|71)\.eqiad\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': -- To view, visit https://gerrit.wikimedia.org/r/212747 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic16bc4ad85e402186913e2d8f398c0c018184870 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] upgrade db1026 trusty mariadb 10 - change (operations/puppet)
Springle has submitted this change and it was merged. Change subject: upgrade db1026 trusty mariadb 10 .. upgrade db1026 trusty mariadb 10 Change-Id: Ic16bc4ad85e402186913e2d8f398c0c018184870 --- M manifests/site.pp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/site.pp b/manifests/site.pp index 37b95db..e6044ec 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -535,7 +535,7 @@ } } -node /^db10(26|58)\.eqiad\.wmnet/ { +node /^db10(58)\.eqiad\.wmnet/ { $cluster = 'mysql' class { 'role::coredb::s5': @@ -628,7 +628,7 @@ } } -node /^db10(45|49|70|71)\.eqiad\.wmnet/ { +node /^db10(26|45|49|70|71)\.eqiad\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': -- To view, visit https://gerrit.wikimedia.org/r/212747 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic16bc4ad85e402186913e2d8f398c0c018184870 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1045; depool db1026 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/212280 Change subject: repool db1045; depool db1026 .. repool db1045; depool db1026 Change-Id: I63482241fe1e868cc3b1bb9c38716ed2b0489110 --- M wmf-config/db-eqiad.php 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/80/212280/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index bd7d593..0746ec6 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -126,9 +126,9 @@ ), 's5' = array( 'db1058' = 0, # 2.8TB 96GB - # upgrade 'db1045' = 0, # 1.4TB 64GB, vslow, dump 'db1049' = 0, # 1.4TB 64GB, vslow, dump, api - 'db1026' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager + 'db1045' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager + # upgrade 'db1026' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager 'db1070' = 500, # 2.8TB 160GB 'db1071' = 500, # 2.8TB 160GB ), @@ -281,19 +281,19 @@ 'db1049' = 1, ), 'watchlist' = array( - 'db1026' = 1, + 'db1045' = 1, ), 'recentchanges' = array( - 'db1026' = 1, + 'db1045' = 1, ), 'recentchangeslinked' = array( - 'db1026' = 1, + 'db1045' = 1, ), 'contributions' = array( - 'db1026' = 1, + 'db1045' = 1, ), 'logpager' = array( - 'db1026' = 1, + 'db1045' = 1, ), ), 's6' = array( -- To view, visit https://gerrit.wikimedia.org/r/212280 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I63482241fe1e868cc3b1bb9c38716ed2b0489110 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] upgrade db1045 to trusty + mariadb 10 - change (operations/puppet)
Springle has submitted this change and it was merged. Change subject: upgrade db1045 to trusty + mariadb 10 .. upgrade db1045 to trusty + mariadb 10 Change-Id: I1263479e8be2963149cab89e488d4bff1226c92b --- M manifests/site.pp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/site.pp b/manifests/site.pp index ec9c34e..d13e01f 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -535,7 +535,7 @@ } } -node /^db10(26|45|58)\.eqiad\.wmnet/ { +node /^db10(26|58)\.eqiad\.wmnet/ { $cluster = 'mysql' class { 'role::coredb::s5': @@ -628,7 +628,7 @@ } } -node /^db10(49|70|71)\.eqiad\.wmnet/ { +node /^db10(45|49|70|71)\.eqiad\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': -- To view, visit https://gerrit.wikimedia.org/r/212238 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1263479e8be2963149cab89e488d4bff1226c92b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] depool db1045 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/212237 Change subject: depool db1045 .. depool db1045 Change-Id: I8a68fb743769b190e5d18e223d291925c19083e7 --- M wmf-config/db-eqiad.php 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/37/212237/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index db1cc57..bd7d593 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -126,9 +126,9 @@ ), 's5' = array( 'db1058' = 0, # 2.8TB 96GB - 'db1045' = 0, # 1.4TB 64GB, vslow, dump + # upgrade 'db1045' = 0, # 1.4TB 64GB, vslow, dump + 'db1049' = 0, # 1.4TB 64GB, vslow, dump, api 'db1026' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager - 'db1049' = 0, # 1.4TB 64GB, api 'db1070' = 500, # 2.8TB 160GB 'db1071' = 500, # 2.8TB 160GB ), @@ -272,10 +272,10 @@ ), 's5' = array( 'vslow' = array( - 'db1045' = 1, + 'db1049' = 1, ), 'dump' = array( - 'db1045' = 1, + 'db1049' = 1, ), 'api' = array( 'db1049' = 1, -- To view, visit https://gerrit.wikimedia.org/r/212237 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8a68fb743769b190e5d18e223d291925c19083e7 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] upgrade db1045 to trusty + mariadb 10 - change (operations/puppet)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/212238 Change subject: upgrade db1045 to trusty + mariadb 10 .. upgrade db1045 to trusty + mariadb 10 Change-Id: I1263479e8be2963149cab89e488d4bff1226c92b --- M manifests/site.pp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/38/212238/1 diff --git a/manifests/site.pp b/manifests/site.pp index ec9c34e..d13e01f 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -535,7 +535,7 @@ } } -node /^db10(26|45|58)\.eqiad\.wmnet/ { +node /^db10(26|58)\.eqiad\.wmnet/ { $cluster = 'mysql' class { 'role::coredb::s5': @@ -628,7 +628,7 @@ } } -node /^db10(49|70|71)\.eqiad\.wmnet/ { +node /^db10(45|49|70|71)\.eqiad\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': -- To view, visit https://gerrit.wikimedia.org/r/212238 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1263479e8be2963149cab89e488d4bff1226c92b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] depool db1045 - change (operations/mediawiki-config)
Springle has submitted this change and it was merged. Change subject: depool db1045 .. depool db1045 Change-Id: I8a68fb743769b190e5d18e223d291925c19083e7 --- M wmf-config/db-eqiad.php 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Springle: Verified; Looks good to me, approved diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index db1cc57..bd7d593 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -126,9 +126,9 @@ ), 's5' = array( 'db1058' = 0, # 2.8TB 96GB - 'db1045' = 0, # 1.4TB 64GB, vslow, dump + # upgrade 'db1045' = 0, # 1.4TB 64GB, vslow, dump + 'db1049' = 0, # 1.4TB 64GB, vslow, dump, api 'db1026' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager - 'db1049' = 0, # 1.4TB 64GB, api 'db1070' = 500, # 2.8TB 160GB 'db1071' = 500, # 2.8TB 160GB ), @@ -272,10 +272,10 @@ ), 's5' = array( 'vslow' = array( - 'db1045' = 1, + 'db1049' = 1, ), 'dump' = array( - 'db1045' = 1, + 'db1049' = 1, ), 'api' = array( 'db1049' = 1, -- To view, visit https://gerrit.wikimedia.org/r/212237 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8a68fb743769b190e5d18e223d291925c19083e7 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1053 in s1 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/211124 Change subject: repool db1053 in s1 .. repool db1053 in s1 Change-Id: I17230c999b90ecbd150c2ed41a4d327ddc3e2f9f --- M wmf-config/db-eqiad.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/24/211124/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 939b36f..db1cc57 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -91,7 +91,8 @@ 'db1052' = 0, # 2.8TB 96GB 'db1051' = 0, # 2.8TB 96GB, vslow, dump 'db1055' = 0, # 2.8TB 96GB, watchlist, recentchanges, contributions, logpager - 'db1057' = 100, # 2.8TB 96GB + 'db1053' = 200, # 2.8TB 96GB + 'db1057' = 200, # 2.8TB 96GB 'db1065' = 100, # 2.8TB 160GB, api 'db1066' = 100, # 2.8TB 160GB, api 'db1072' = 500, # 2.8TB 160GB @@ -117,7 +118,6 @@ 's4' = array( 'db1040' = 0, # 1.4TB 64GB 'db1042' = 0, # 1.4TB 64GB, vslow, dump - # upgrade 'db1053' = 0, # 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1019' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager 'db1056' = 100, # 2.8TB 96GB, api 'db1059' = 100, # 2.8TB 96GB, api -- To view, visit https://gerrit.wikimedia.org/r/211124 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I17230c999b90ecbd150c2ed41a4d327ddc3e2f9f Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1053 in s1 - change (operations/mediawiki-config)
Springle has submitted this change and it was merged. Change subject: repool db1053 in s1 .. repool db1053 in s1 Change-Id: I17230c999b90ecbd150c2ed41a4d327ddc3e2f9f --- M wmf-config/db-eqiad.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Springle: Looks good to me, approved diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 939b36f..db1cc57 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -91,7 +91,8 @@ 'db1052' = 0, # 2.8TB 96GB 'db1051' = 0, # 2.8TB 96GB, vslow, dump 'db1055' = 0, # 2.8TB 96GB, watchlist, recentchanges, contributions, logpager - 'db1057' = 100, # 2.8TB 96GB + 'db1053' = 200, # 2.8TB 96GB + 'db1057' = 200, # 2.8TB 96GB 'db1065' = 100, # 2.8TB 160GB, api 'db1066' = 100, # 2.8TB 160GB, api 'db1072' = 500, # 2.8TB 160GB @@ -117,7 +118,6 @@ 's4' = array( 'db1040' = 0, # 1.4TB 64GB 'db1042' = 0, # 1.4TB 64GB, vslow, dump - # upgrade 'db1053' = 0, # 2.8TB 96GB, watchlist, recentchanges, contributions, logpager 'db1019' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager 'db1056' = 100, # 2.8TB 96GB, api 'db1059' = 100, # 2.8TB 96GB, api -- To view, visit https://gerrit.wikimedia.org/r/211124 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I17230c999b90ecbd150c2ed41a4d327ddc3e2f9f Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add grants on centralauth.* via production-grants-core - change (operations/puppet)
Springle has submitted this change and it was merged. Change subject: Add grants on centralauth.* via production-grants-core .. Add grants on centralauth.* via production-grants-core This is not puppetized yet, but obviously needed. See also the grants on any s7 host (I checked db1033 as a reference). Change-Id: Ia411dac195b80a13ba3a7ba84fc99665de4d8418 --- M templates/mariadb/production-grants-core.sql.erb 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/mariadb/production-grants-core.sql.erb b/templates/mariadb/production-grants-core.sql.erb index d9a906f..0ec53fa 100644 --- a/templates/mariadb/production-grants-core.sql.erb +++ b/templates/mariadb/production-grants-core.sql.erb @@ -7,6 +7,9 @@ GRANT ALL PRIVILEGES ON `%wik%`.* TO 'wikiadmin'@'10.%'; +GRANT ALL PRIVILEGES +ON `centralauth`.* TO 'wikiadmin'@'10.%'; + -- wikiuser 10.64.% GRANT PROCESS, REPLICATION CLIENT @@ -16,6 +19,9 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON `%wik%`.* TO 'wikiuser'@'10.64.%'; +GRANT SELECT, INSERT, UPDATE, DELETE +ON `centralauth`.* TO 'wikiuser'@'10.64.%'; + -- wikiuser 10.192.% GRANT PROCESS, REPLICATION CLIENT @@ -24,3 +30,6 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON `%wik%`.* TO 'wikiuser'@'10.192.%'; + +GRANT SELECT, INSERT, UPDATE, DELETE +ON `centralauth`.* TO 'wikiuser'@'10.192.%'; -- To view, visit https://gerrit.wikimedia.org/r/210932 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia411dac195b80a13ba3a7ba84fc99665de4d8418 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hoo man h...@online.de Gerrit-Reviewer: Jcrespo jcre...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1018 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/211076 Change subject: repool db1018 .. repool db1018 Change-Id: I29065cd9d02738ffdce919d6843045b1eca160c2 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/76/211076/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 0f64da1..939b36f 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -99,9 +99,9 @@ ), 's2' = array( 'db1024' = 0, # 1.4TB 64GB - # upgrade 'db1018' = 0, # 1.4TB 64GB, snapshot, dump, vslow 'db1021' = 0, # 1.4TB 64GB, dump, vslow 'db1036' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager + 'db1018' = 200, # 1.4TB 64GB 'db1054' = 200, # 2.8TB 96GB, api 'db1060' = 200, # 2.8TB 96GB, api 'db1063' = 400, # 2.8TB 128GB -- To view, visit https://gerrit.wikimedia.org/r/211076 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I29065cd9d02738ffdce919d6843045b1eca160c2 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] reassign db1053 to s1 - change (operations/puppet)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/211073 Change subject: reassign db1053 to s1 .. reassign db1053 to s1 Change-Id: I271cf6df3132eeb1d4e4e89d7e924ce924779e17 --- M manifests/site.pp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/73/211073/1 diff --git a/manifests/site.pp b/manifests/site.pp index c1eb5bb..2327d35 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -526,7 +526,7 @@ } } -node /^db10(40|53)\.eqiad\.wmnet/ { +node /^db10(40)\.eqiad\.wmnet/ { $cluster = 'mysql' class { 'role::coredb::s4': @@ -564,7 +564,7 @@ # MariaDB 10 -node /^db10(51|55|57|65|66|72|73)\.eqiad\.wmnet/ { +node /^db10(51|53|55|57|65|66|72|73)\.eqiad\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': -- To view, visit https://gerrit.wikimedia.org/r/211073 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I271cf6df3132eeb1d4e4e89d7e924ce924779e17 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] table partitioning for s4 logpager slave - change (operations/software)
Springle has submitted this change and it was merged. Change subject: table partitioning for s4 logpager slave .. table partitioning for s4 logpager slave Change-Id: I6122938cd03dd9136c4072902414ae92c1c1b2dd --- A dbtools/s4-pager.sql 1 file changed, 61 insertions(+), 0 deletions(-) Approvals: Jcrespo: Checked; Looks good to me, but someone else must approve Springle: Verified; Looks good to me, approved diff --git a/dbtools/s4-pager.sql b/dbtools/s4-pager.sql new file mode 100644 index 000..3f8487f --- /dev/null +++ b/dbtools/s4-pager.sql @@ -0,0 +1,61 @@ +-- commonswiki + + select 1 as n, count(rev_user) from commonswiki.revision where rev_user 1 +union select 1 as n, count(rev_user) from commonswiki.revision where rev_user = 1 and rev_user 1 +union select 2 as n, count(rev_user) from commonswiki.revision where rev_user = 1 and rev_user 2 +union select 3 as n, count(rev_user) from commonswiki.revision where rev_user = 2 and rev_user 3 +union select 4 as n, count(rev_user) from commonswiki.revision where rev_user = 3 and rev_user 4 +union select 5 as n, count(rev_user) from commonswiki.revision where rev_user = 4 and rev_user 5 +union select 10 as n, count(rev_user) from commonswiki.revision where rev_user = 5 and rev_user 10 +union select 20 as n, count(rev_user) from commonswiki.revision where rev_user = 10 and rev_user 20 +union select 30 as n, count(rev_user) from commonswiki.revision where rev_user = 20 and rev_user 30 +union select 40 as n, count(rev_user) from commonswiki.revision where rev_user = 30 and rev_user 40 +union select 50 as n, count(rev_user) from commonswiki.revision where rev_user = 40 and rev_user 50 +union select 100 as n, count(rev_user) from commonswiki.revision where rev_user = 50 and rev_user 100 +union select 200 as n, count(rev_user) from commonswiki.revision where rev_user = 100 and rev_user 200 +union select 200 as n, count(rev_user) from commonswiki.revision where rev_user = 200 and rev_user 300 +union select 200 as n, count(rev_user) from commonswiki.revision where rev_user = 300 and rev_user 400 +union select 200 as n, count(rev_user) from commonswiki.revision where rev_user = 400 and rev_user 500; + +ALTER TABLE commonswiki.logging + DROP PRIMARY KEY, + ADD PRIMARY KEY (log_id, log_user) + PARTITION BY RANGE (log_user) ( + PARTITION p1 VALUES LESS THAN (1), + PARTITION p1 VALUES LESS THAN (1), + PARTITION p2 VALUES LESS THAN (2), + PARTITION p3 VALUES LESS THAN (3), + PARTITION p4 VALUES LESS THAN (4), + PARTITION p5 VALUES LESS THAN (5), + PARTITION p10 VALUES LESS THAN (10), + PARTITION p20 VALUES LESS THAN (20), + PARTITION p30 VALUES LESS THAN (30), + PARTITION p40 VALUES LESS THAN (40), + PARTITION p50 VALUES LESS THAN (50), + PARTITION p100 VALUES LESS THAN (100), + PARTITION p200 VALUES LESS THAN (200), + PARTITION p300 VALUES LESS THAN (300), + PARTITION p400 VALUES LESS THAN (400), + PARTITION pMAXVALUE VALUES LESS THAN MAXVALUE ); + +ALTER TABLE commonswiki.revision + DROP PRIMARY KEY, + DROP INDEX rev_id, + ADD PRIMARY KEY (rev_id, rev_user) + PARTITION BY RANGE (rev_user) ( + PARTITION p1 VALUES LESS THAN (1), + PARTITION p1 VALUES LESS THAN (1), + PARTITION p2 VALUES LESS THAN (2), + PARTITION p3 VALUES LESS THAN (3), + PARTITION p4 VALUES LESS THAN (4), + PARTITION p5 VALUES LESS THAN (5), + PARTITION p10 VALUES LESS THAN (10), + PARTITION p20 VALUES LESS THAN (20), + PARTITION p30 VALUES LESS THAN (30), + PARTITION p40 VALUES LESS THAN (40), + PARTITION p50 VALUES LESS THAN (50), + PARTITION p100 VALUES LESS THAN (100), + PARTITION p200 VALUES LESS THAN (200), + PARTITION p300 VALUES LESS THAN (300), + PARTITION p400 VALUES LESS THAN (400), + PARTITION pMAXVALUE VALUES LESS THAN MAXVALUE ); \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/210880 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6122938cd03dd9136c4072902414ae92c1c1b2dd Gerrit-PatchSet: 1 Gerrit-Project: operations/software Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Jcrespo jcre...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] table partitioning for s4 logpager slave - change (operations/software)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/210880 Change subject: table partitioning for s4 logpager slave .. table partitioning for s4 logpager slave Change-Id: I6122938cd03dd9136c4072902414ae92c1c1b2dd --- A dbtools/s4-pager.sql 1 file changed, 61 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software refs/changes/80/210880/1 diff --git a/dbtools/s4-pager.sql b/dbtools/s4-pager.sql new file mode 100644 index 000..3f8487f --- /dev/null +++ b/dbtools/s4-pager.sql @@ -0,0 +1,61 @@ +-- commonswiki + + select 1 as n, count(rev_user) from commonswiki.revision where rev_user 1 +union select 1 as n, count(rev_user) from commonswiki.revision where rev_user = 1 and rev_user 1 +union select 2 as n, count(rev_user) from commonswiki.revision where rev_user = 1 and rev_user 2 +union select 3 as n, count(rev_user) from commonswiki.revision where rev_user = 2 and rev_user 3 +union select 4 as n, count(rev_user) from commonswiki.revision where rev_user = 3 and rev_user 4 +union select 5 as n, count(rev_user) from commonswiki.revision where rev_user = 4 and rev_user 5 +union select 10 as n, count(rev_user) from commonswiki.revision where rev_user = 5 and rev_user 10 +union select 20 as n, count(rev_user) from commonswiki.revision where rev_user = 10 and rev_user 20 +union select 30 as n, count(rev_user) from commonswiki.revision where rev_user = 20 and rev_user 30 +union select 40 as n, count(rev_user) from commonswiki.revision where rev_user = 30 and rev_user 40 +union select 50 as n, count(rev_user) from commonswiki.revision where rev_user = 40 and rev_user 50 +union select 100 as n, count(rev_user) from commonswiki.revision where rev_user = 50 and rev_user 100 +union select 200 as n, count(rev_user) from commonswiki.revision where rev_user = 100 and rev_user 200 +union select 200 as n, count(rev_user) from commonswiki.revision where rev_user = 200 and rev_user 300 +union select 200 as n, count(rev_user) from commonswiki.revision where rev_user = 300 and rev_user 400 +union select 200 as n, count(rev_user) from commonswiki.revision where rev_user = 400 and rev_user 500; + +ALTER TABLE commonswiki.logging + DROP PRIMARY KEY, + ADD PRIMARY KEY (log_id, log_user) + PARTITION BY RANGE (log_user) ( + PARTITION p1 VALUES LESS THAN (1), + PARTITION p1 VALUES LESS THAN (1), + PARTITION p2 VALUES LESS THAN (2), + PARTITION p3 VALUES LESS THAN (3), + PARTITION p4 VALUES LESS THAN (4), + PARTITION p5 VALUES LESS THAN (5), + PARTITION p10 VALUES LESS THAN (10), + PARTITION p20 VALUES LESS THAN (20), + PARTITION p30 VALUES LESS THAN (30), + PARTITION p40 VALUES LESS THAN (40), + PARTITION p50 VALUES LESS THAN (50), + PARTITION p100 VALUES LESS THAN (100), + PARTITION p200 VALUES LESS THAN (200), + PARTITION p300 VALUES LESS THAN (300), + PARTITION p400 VALUES LESS THAN (400), + PARTITION pMAXVALUE VALUES LESS THAN MAXVALUE ); + +ALTER TABLE commonswiki.revision + DROP PRIMARY KEY, + DROP INDEX rev_id, + ADD PRIMARY KEY (rev_id, rev_user) + PARTITION BY RANGE (rev_user) ( + PARTITION p1 VALUES LESS THAN (1), + PARTITION p1 VALUES LESS THAN (1), + PARTITION p2 VALUES LESS THAN (2), + PARTITION p3 VALUES LESS THAN (3), + PARTITION p4 VALUES LESS THAN (4), + PARTITION p5 VALUES LESS THAN (5), + PARTITION p10 VALUES LESS THAN (10), + PARTITION p20 VALUES LESS THAN (20), + PARTITION p30 VALUES LESS THAN (30), + PARTITION p40 VALUES LESS THAN (40), + PARTITION p50 VALUES LESS THAN (50), + PARTITION p100 VALUES LESS THAN (100), + PARTITION p200 VALUES LESS THAN (200), + PARTITION p300 VALUES LESS THAN (300), + PARTITION p400 VALUES LESS THAN (400), + PARTITION pMAXVALUE VALUES LESS THAN MAXVALUE ); \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/210880 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6122938cd03dd9136c4072902414ae92c1c1b2dd Gerrit-PatchSet: 1 Gerrit-Project: operations/software Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1019; depool db1053 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/211072 Change subject: repool db1019; depool db1053 .. repool db1019; depool db1053 Change-Id: Ice43a43d5596af30a515ab4f5b1b25a428a4de8d --- M wmf-config/db-eqiad.php 1 file changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/72/211072/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 6c9a655..0f64da1 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -111,14 +111,14 @@ 'db1038' = 0, # 1.4TB 64GB 'db1027' = 0, # 1.4TB 64GB, vslow, dump 'db1015' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager - # troubleshooting 'db1019' = 400, # 1.4TB 64GB 'db1035' = 400, # 1.4TB 64GB 'db1044' = 400, # 1.4TB 64GB ), 's4' = array( 'db1040' = 0, # 1.4TB 64GB 'db1042' = 0, # 1.4TB 64GB, vslow, dump - 'db1053' = 0, # 2.8TB 96GB, watchlist, recentchanges, contributions, logpager + # upgrade 'db1053' = 0, # 2.8TB 96GB, watchlist, recentchanges, contributions, logpager + 'db1019' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager 'db1056' = 100, # 2.8TB 96GB, api 'db1059' = 100, # 2.8TB 96GB, api 'db1064' = 500, # 2.8TB 160GB @@ -255,19 +255,19 @@ 'db1059' = 1, ), 'watchlist' = array( - 'db1053' = 1, + 'db1019' = 1, ), 'recentchanges' = array( - 'db1053' = 1, + 'db1019' = 1, ), 'recentchangeslinked' = array( - 'db1053' = 1, + 'db1019' = 1, ), 'contributions' = array( - 'db1053' = 1, + 'db1019' = 1, ), 'logpager' = array( - 'db1053' = 1, + 'db1019' = 1, ), ), 's5' = array( -- To view, visit https://gerrit.wikimedia.org/r/211072 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ice43a43d5596af30a515ab4f5b1b25a428a4de8d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] reassign db1053 to s1 - change (operations/puppet)
Springle has submitted this change and it was merged. Change subject: reassign db1053 to s1 .. reassign db1053 to s1 Change-Id: I271cf6df3132eeb1d4e4e89d7e924ce924779e17 --- M manifests/site.pp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/site.pp b/manifests/site.pp index c1eb5bb..2327d35 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -526,7 +526,7 @@ } } -node /^db10(40|53)\.eqiad\.wmnet/ { +node /^db10(40)\.eqiad\.wmnet/ { $cluster = 'mysql' class { 'role::coredb::s4': @@ -564,7 +564,7 @@ # MariaDB 10 -node /^db10(51|55|57|65|66|72|73)\.eqiad\.wmnet/ { +node /^db10(51|53|55|57|65|66|72|73)\.eqiad\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': -- To view, visit https://gerrit.wikimedia.org/r/211073 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I271cf6df3132eeb1d4e4e89d7e924ce924779e17 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] depool db1060 for thread pool reconfig - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/210676 Change subject: depool db1060 for thread pool reconfig .. depool db1060 for thread pool reconfig Change-Id: If9d5b427c4f822877603afd9ae110845270a4ff9 --- M wmf-config/db-eqiad.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/76/210676/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 6c9a655..2bf0beb 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -103,7 +103,7 @@ 'db1021' = 0, # 1.4TB 64GB, dump, vslow 'db1036' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager 'db1054' = 200, # 2.8TB 96GB, api - 'db1060' = 200, # 2.8TB 96GB, api + # thread pool reconfig 'db1060' = 200, # 2.8TB 96GB, api 'db1063' = 400, # 2.8TB 128GB 'db1067' = 500, # 2.8TB 160GB ), @@ -202,7 +202,7 @@ ), 'api' = array( 'db1054' = 1, - 'db1060' = 1, + # thread pool reconfig 'db1060' = 1, ), 'watchlist' = array( 'db1036' = 1, -- To view, visit https://gerrit.wikimedia.org/r/210676 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If9d5b427c4f822877603afd9ae110845270a4ff9 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] move db1019 to s4 - change (operations/puppet)
Springle has submitted this change and it was merged. Change subject: move db1019 to s4 .. move db1019 to s4 Change-Id: I48345b56aad1fbb9dc37271066fc03335fb15aea --- M manifests/site.pp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/site.pp b/manifests/site.pp index 67153c5..2a9c965 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -596,7 +596,7 @@ } } -node /^db10(15|19|27|35|44)\.eqiad\.wmnet/ { +node /^db10(15|27|35|44)\.eqiad\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -612,7 +612,7 @@ } } -node /^db10(42|56|59|64|68)\.eqiad\.wmnet/ { +node /^db10(19|42|56|59|64|68)\.eqiad\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': -- To view, visit https://gerrit.wikimedia.org/r/210848 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I48345b56aad1fbb9dc37271066fc03335fb15aea Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1060 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/210844 Change subject: repool db1060 .. repool db1060 Change-Id: Idb1851b2f30402f232a3e56a78c7660d1192925d --- M wmf-config/db-eqiad.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/44/210844/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 2bf0beb..6c9a655 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -103,7 +103,7 @@ 'db1021' = 0, # 1.4TB 64GB, dump, vslow 'db1036' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager 'db1054' = 200, # 2.8TB 96GB, api - # thread pool reconfig 'db1060' = 200, # 2.8TB 96GB, api + 'db1060' = 200, # 2.8TB 96GB, api 'db1063' = 400, # 2.8TB 128GB 'db1067' = 500, # 2.8TB 160GB ), @@ -202,7 +202,7 @@ ), 'api' = array( 'db1054' = 1, - # thread pool reconfig 'db1060' = 1, + 'db1060' = 1, ), 'watchlist' = array( 'db1036' = 1, -- To view, visit https://gerrit.wikimedia.org/r/210844 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idb1851b2f30402f232a3e56a78c7660d1192925d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] move db1019 to s4 - change (operations/puppet)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/210848 Change subject: move db1019 to s4 .. move db1019 to s4 Change-Id: I48345b56aad1fbb9dc37271066fc03335fb15aea --- M manifests/site.pp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/48/210848/1 diff --git a/manifests/site.pp b/manifests/site.pp index 67153c5..2a9c965 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -596,7 +596,7 @@ } } -node /^db10(15|19|27|35|44)\.eqiad\.wmnet/ { +node /^db10(15|27|35|44)\.eqiad\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -612,7 +612,7 @@ } } -node /^db10(42|56|59|64|68)\.eqiad\.wmnet/ { +node /^db10(19|42|56|59|64|68)\.eqiad\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': -- To view, visit https://gerrit.wikimedia.org/r/210848 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I48345b56aad1fbb9dc37271066fc03335fb15aea Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] depool db1018 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/210643 Change subject: depool db1018 .. depool db1018 Change-Id: I09ebb12145175e01feec5ff5157d00b46e6be1fb --- M wmf-config/db-eqiad.php 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/43/210643/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index c24abcc..6c9a655 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -99,9 +99,9 @@ ), 's2' = array( 'db1024' = 0, # 1.4TB 64GB - 'db1018' = 0, # 1.4TB 64GB, snapshot, dump, vslow + # upgrade 'db1018' = 0, # 1.4TB 64GB, snapshot, dump, vslow + 'db1021' = 0, # 1.4TB 64GB, dump, vslow 'db1036' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager - 'db1021' = 200, # 1.4TB 64GB 'db1054' = 200, # 2.8TB 96GB, api 'db1060' = 200, # 2.8TB 96GB, api 'db1063' = 400, # 2.8TB 128GB @@ -195,10 +195,10 @@ ), 's2' = array( 'vslow' = array( - 'db1018' = 1, + 'db1021' = 1, ), 'dump' = array( - 'db1018' = 1, + 'db1021' = 1, ), 'api' = array( 'db1054' = 1, -- To view, visit https://gerrit.wikimedia.org/r/210643 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I09ebb12145175e01feec5ff5157d00b46e6be1fb Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] expand list of CODFW slaves ready for traffic - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/210004 Change subject: expand list of CODFW slaves ready for traffic .. expand list of CODFW slaves ready for traffic Change-Id: I85a4a8d0d2c84d64f980534fb577c28e82d6fcd4 --- M wmf-config/db-codfw.php 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/04/210004/1 diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index b716e28..d252a1f 100755 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -92,36 +92,50 @@ 'db1052' = 0, # 2.8TB 96GB 'db2016' = 100, 'db2034' = 100, + 'db2042' = 100, + 'db2048' = 100, ), 's2' = array( 'db1024' = 0, # 1.4TB 64GB 'db2017' = 100, 'db2035' = 100, + 'db2041' = 100, + 'db2049' = 100, ), /* s3 */ 'DEFAULT' = array( 'db1038' = 0, # 1.4TB 64GB 'db2018' = 100, 'db2036' = 100, + 'db2043' = 100, + 'db2050' = 100, ), 's4' = array( 'db1040' = 0, # 1.4TB 64GB 'db2019' = 100, 'db2037' = 100, + 'db2044' = 100, + 'db2051' = 100, ), 's5' = array( 'db1058' = 0, # 2.8TB 96GB 'db2023' = 100, 'db2038' = 100, + 'db2045' = 100, + 'db2052' = 100, ), 's6' = array( 'db1023' = 0, # 1.4TB 64GB 'db2028' = 100, 'db2039' = 100, + 'db2046' = 100, + 'db2053' = 100, ), 's7' = array( 'db1033' = 0, # 1.4TB 64GB, 'db2029' = 100, 'db2040' = 100, + 'db2047' = 100, + 'db2054' = 100, ), 'silver' = array( 'silver' = 100, # I have no idea if this is right -- To view, visit https://gerrit.wikimedia.org/r/210004 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I85a4a8d0d2c84d64f980534fb577c28e82d6fcd4 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] whitespace consistency - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/210003 Change subject: whitespace consistency .. whitespace consistency Change-Id: Ie71795d0cc495c3a8f973c924214809fca28fe5e --- M wmf-config/db-codfw.php 1 file changed, 15 insertions(+), 15 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/03/210003/1 diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index 93cc22d..b716e28 100755 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -90,38 +90,38 @@ 'sectionLoads' = array( 's1' = array( 'db1052' = 0, # 2.8TB 96GB -'db2016' = 100, -'db2034' = 100, + 'db2016' = 100, + 'db2034' = 100, ), 's2' = array( 'db1024' = 0, # 1.4TB 64GB -'db2017' = 100, -'db2035' = 100, + 'db2017' = 100, + 'db2035' = 100, ), /* s3 */ 'DEFAULT' = array( 'db1038' = 0, # 1.4TB 64GB -'db2018' = 100, -'db2036' = 100, + 'db2018' = 100, + 'db2036' = 100, ), 's4' = array( 'db1040' = 0, # 1.4TB 64GB -'db2019' = 100, -'db2037' = 100, + 'db2019' = 100, + 'db2037' = 100, ), 's5' = array( 'db1058' = 0, # 2.8TB 96GB -'db2023' = 100, -'db2038' = 100, + 'db2023' = 100, + 'db2038' = 100, ), 's6' = array( 'db1023' = 0, # 1.4TB 64GB -'db2028' = 100, -'db2039' = 100, + 'db2028' = 100, + 'db2039' = 100, ), 's7' = array( 'db1033' = 0, # 1.4TB 64GB, -'db2029' = 100, -'db2040' = 100, + 'db2029' = 100, + 'db2040' = 100, ), 'silver' = array( 'silver' = 100, # I have no idea if this is right @@ -291,7 +291,7 @@ # es3 'cluster25' = array( '10.64.32.19' = 1, # es1009, master -'10.192.16.29' = 1, #es2008 + '10.192.16.29' = 1, #es2008 '10.192.16.30' = 3, # es2009 '10.192.16.31' = 3, # es2010 ), -- To view, visit https://gerrit.wikimedia.org/r/210003 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie71795d0cc495c3a8f973c924214809fca28fe5e Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] depool db1019 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/209488 Change subject: depool db1019 .. depool db1019 Change-Id: Iaf5df00fc52bfaa0b51414a94e35a7a0e75a1927 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/88/209488/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index a7ec295..c24abcc 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -111,7 +111,7 @@ 'db1038' = 0, # 1.4TB 64GB 'db1027' = 0, # 1.4TB 64GB, vslow, dump 'db1015' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager - 'db1019' = 400, # 1.4TB 64GB + # troubleshooting 'db1019' = 400, # 1.4TB 64GB 'db1035' = 400, # 1.4TB 64GB 'db1044' = 400, # 1.4TB 64GB ), -- To view, visit https://gerrit.wikimedia.org/r/209488 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf5df00fc52bfaa0b51414a94e35a7a0e75a1927 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1021 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/209221 Change subject: repool db1021 .. repool db1021 Change-Id: I22117c2455b5bc246e313078c740a2e069b54d8b --- M wmf-config/db-eqiad.php 1 file changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/21/209221/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 4c9637a..f5fccf8 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -101,9 +101,9 @@ 'db1024' = 0, # 1.4TB 64GB 'db1018' = 0, # 1.4TB 64GB, snapshot, dump, vslow 'db1036' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager - # T89801 mce errors 'db1054' = 200, # 2.8TB 96GB, api + 'db1021' = 100, # 1.4TB 64GB, api 'db1060' = 200, # 2.8TB 96GB, api - 'db1063' = 500, # 2.8TB 128GB + 'db1063' = 400, # 2.8TB 128GB 'db1067' = 500, # 2.8TB 160GB ), /* s3 */ 'DEFAULT' = array( @@ -127,7 +127,6 @@ 'db1058' = 0, # 2.8TB 96GB 'db1045' = 0, # 1.4TB 64GB, vslow, dump 'db1026' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager - # upgrade 'db1021' = 400, # 1.4TB 64GB, traffic sampling 'db1049' = 0, # 1.4TB 64GB, api 'db1070' = 500, # 2.8TB 160GB 'db1071' = 500, # 2.8TB 160GB @@ -201,7 +200,7 @@ 'db1018' = 1, ), 'api' = array( - # T89801 mce errors 'db1054' = 1, + 'db1021' = 1, 'db1060' = 1, ), 'watchlist' = array( -- To view, visit https://gerrit.wikimedia.org/r/209221 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I22117c2455b5bc246e313078c740a2e069b54d8b Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] return db1054 to s2 - change (operations/puppet)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/209415 Change subject: return db1054 to s2 .. return db1054 to s2 Bug: T89801 Change-Id: I9f4ae5f690b5d7d37428a29f5706ac5a0612c516 --- M manifests/site.pp 1 file changed, 1 insertion(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/15/209415/1 diff --git a/manifests/site.pp b/manifests/site.pp index 433802b..053b7d7 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -572,7 +572,7 @@ } } -node /^db10(21|36|60|63|67)\.eqiad\.wmnet/ { +node /^db10(21|36|54|60|63|67)\.eqiad\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -781,14 +781,6 @@ $cluster = 'mysql' include role::mariadb::tendril -} - -# eqiad db hardware issues -# db1054 T89801 -node /^db10(54)\.eqiad\.wmnet$/ { - -$cluster = 'mysql' -include standard } # codfw db -- To view, visit https://gerrit.wikimedia.org/r/209415 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9f4ae5f690b5d7d37428a29f5706ac5a0612c516 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1054 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/209417 Change subject: repool db1054 .. repool db1054 Change-Id: Icba6050bb0a25f6163cf4674438a019ffca7b40a --- M wmf-config/db-eqiad.php 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/17/209417/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index f5fccf8..a7ec295 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -101,7 +101,8 @@ 'db1024' = 0, # 1.4TB 64GB 'db1018' = 0, # 1.4TB 64GB, snapshot, dump, vslow 'db1036' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager - 'db1021' = 100, # 1.4TB 64GB, api + 'db1021' = 200, # 1.4TB 64GB + 'db1054' = 200, # 2.8TB 96GB, api 'db1060' = 200, # 2.8TB 96GB, api 'db1063' = 400, # 2.8TB 128GB 'db1067' = 500, # 2.8TB 160GB @@ -200,7 +201,7 @@ 'db1018' = 1, ), 'api' = array( - 'db1021' = 1, + 'db1054' = 1, 'db1060' = 1, ), 'watchlist' = array( -- To view, visit https://gerrit.wikimedia.org/r/209417 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icba6050bb0a25f6163cf4674438a019ffca7b40a Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] return db1054 to s2 - change (operations/puppet)
Springle has submitted this change and it was merged. Change subject: return db1054 to s2 .. return db1054 to s2 Bug: T89801 Change-Id: I9f4ae5f690b5d7d37428a29f5706ac5a0612c516 --- M manifests/site.pp 1 file changed, 1 insertion(+), 9 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/site.pp b/manifests/site.pp index 433802b..053b7d7 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -572,7 +572,7 @@ } } -node /^db10(21|36|60|63|67)\.eqiad\.wmnet/ { +node /^db10(21|36|54|60|63|67)\.eqiad\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -781,14 +781,6 @@ $cluster = 'mysql' include role::mariadb::tendril -} - -# eqiad db hardware issues -# db1054 T89801 -node /^db10(54)\.eqiad\.wmnet$/ { - -$cluster = 'mysql' -include standard } # codfw db -- To view, visit https://gerrit.wikimedia.org/r/209415 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9f4ae5f690b5d7d37428a29f5706ac5a0612c516 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] move db1021 to s2 and db1054 to sideline - change (operations/puppet)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/209164 Change subject: move db1021 to s2 and db1054 to sideline .. move db1021 to s2 and db1054 to sideline Bug: T89801 Change-Id: I9d554411688b4021bd6f1b54892ec67976a3b5f0 --- M manifests/site.pp 1 file changed, 10 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/64/209164/1 diff --git a/manifests/site.pp b/manifests/site.pp index ce2ee2f..3e7027a 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -527,7 +527,7 @@ } } -node /^db10(21|26|45|58)\.eqiad\.wmnet/ { +node /^db10(26|45|58)\.eqiad\.wmnet/ { $cluster = 'mysql' class { 'role::coredb::s5': @@ -572,7 +572,7 @@ } } -node /^db10(36|54|60|63|67)\.eqiad\.wmnet/ { +node /^db10(21|36|60|63|67)\.eqiad\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -783,6 +783,14 @@ include role::mariadb::tendril } +# eqiad db hardware issues +# db1054 T89801 +node /^db10(54)\.eqiad\.wmnet$/ { + +$cluster = 'mysql' +include standard +} + # codfw db node /^db20(5[5-9]|6[0-9]|70)\.codfw\.wmnet$/ { -- To view, visit https://gerrit.wikimedia.org/r/209164 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9d554411688b4021bd6f1b54892ec67976a3b5f0 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] move db1021 to s2 and db1054 to sideline - change (operations/puppet)
Springle has submitted this change and it was merged. Change subject: move db1021 to s2 and db1054 to sideline .. move db1021 to s2 and db1054 to sideline Bug: T89801 Change-Id: I9d554411688b4021bd6f1b54892ec67976a3b5f0 --- M manifests/site.pp 1 file changed, 10 insertions(+), 2 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/site.pp b/manifests/site.pp index ce2ee2f..3e7027a 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -527,7 +527,7 @@ } } -node /^db10(21|26|45|58)\.eqiad\.wmnet/ { +node /^db10(26|45|58)\.eqiad\.wmnet/ { $cluster = 'mysql' class { 'role::coredb::s5': @@ -572,7 +572,7 @@ } } -node /^db10(36|54|60|63|67)\.eqiad\.wmnet/ { +node /^db10(21|36|60|63|67)\.eqiad\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -783,6 +783,14 @@ include role::mariadb::tendril } +# eqiad db hardware issues +# db1054 T89801 +node /^db10(54)\.eqiad\.wmnet$/ { + +$cluster = 'mysql' +include standard +} + # codfw db node /^db20(5[5-9]|6[0-9]|70)\.codfw\.wmnet$/ { -- To view, visit https://gerrit.wikimedia.org/r/209164 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9d554411688b4021bd6f1b54892ec67976a3b5f0 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1070 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/208869 Change subject: repool db1070 .. repool db1070 Change-Id: I4d1eadca40f756afed4fbda48d97d321ae6c1507 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/69/208869/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 1700ba8..17da789 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -122,7 +122,6 @@ 'db1059' = 100, # 2.8TB 96GB, api 'db1064' = 500, # 2.8TB 160GB 'db1068' = 500, # 2.8TB 160GB - # upgrade 'db1070' = 500, # 2.8TB 160GB ), 's5' = array( 'db1058' = 0, # 2.8TB 96GB @@ -130,6 +129,7 @@ 'db1026' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager 'db1021' = 400, # 1.4TB 64GB, traffic sampling 'db1049' = 400, # 1.4TB 64GB + 'db1070' = 500, # 2.8TB 160GB 'db1071' = 500, # 2.8TB 160GB ), 's6' = array( -- To view, visit https://gerrit.wikimedia.org/r/208869 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4d1eadca40f756afed4fbda48d97d321ae6c1507 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] depool db1021, move s5 api to db1049 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/208876 Change subject: depool db1021, move s5 api to db1049 .. depool db1021, move s5 api to db1049 Change-Id: I3b8143fc6b88de8edb054e718c58edfcdb3a856c --- M wmf-config/db-eqiad.php 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/76/208876/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 17da789..4c9637a 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -125,10 +125,10 @@ ), 's5' = array( 'db1058' = 0, # 2.8TB 96GB - 'db1045' = 0, # 1.4TB 64GB, vslow, api, dump + 'db1045' = 0, # 1.4TB 64GB, vslow, dump 'db1026' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager - 'db1021' = 400, # 1.4TB 64GB, traffic sampling - 'db1049' = 400, # 1.4TB 64GB + # upgrade 'db1021' = 400, # 1.4TB 64GB, traffic sampling + 'db1049' = 0, # 1.4TB 64GB, api 'db1070' = 500, # 2.8TB 160GB 'db1071' = 500, # 2.8TB 160GB ), @@ -278,7 +278,7 @@ 'db1045' = 1, ), 'api' = array( - 'db1045' = 1, + 'db1049' = 1, ), 'watchlist' = array( 'db1026' = 1, -- To view, visit https://gerrit.wikimedia.org/r/208876 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3b8143fc6b88de8edb054e718c58edfcdb3a856c Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] script used for non-replicated dbstore backups - change (operations/puppet)
Springle has submitted this change and it was merged. Change subject: script used for non-replicated dbstore backups .. script used for non-replicated dbstore backups Bug: T95835 Change-Id: I90ee834c2157783e79bb4118f3fe1603ec1646ca --- M manifests/role/mariadb.pp A templates/mariadb/dumps-misc.sh.erb 2 files changed, 34 insertions(+), 0 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp index 69d3694..c2f27cd 100644 --- a/manifests/role/mariadb.pp +++ b/manifests/role/mariadb.pp @@ -281,6 +281,14 @@ lag_crit = $lag_crit, warn_stopped = $warn_stopped, } + +file { '/usr/local/bin/dumps-misc.sh': +ensure = present, +owner = 'root', +group = 'root', +mode= '0755', +content = template('mariadb/dumps-misc.sh.erb'), +} } # MariaDB 10 Analytics all-shards slave, with scratch space and TokuDB diff --git a/templates/mariadb/dumps-misc.sh.erb b/templates/mariadb/dumps-misc.sh.erb new file mode 100644 index 000..6803654 --- /dev/null +++ b/templates/mariadb/dumps-misc.sh.erb @@ -0,0 +1,26 @@ +#!/bin/bash + +find /srv/backups -mtime +14 -type f -delete + +my=/usr/local/bin/mysql --skip-column-names -e +dump=/usr/local/bin/mysqldump --single-transaction --quick + +$dump -h m1-slave --databases bacula etherpadlite librenms puppet racktables rt | \ +pigz /srv/backups/m1-$(date +%Y%m%d%H%M%S).sql.gz + +$dump -h m2-slave --databases iegreview reviewdb scholarships | \ +pigz /srv/backups/m2-$(date +%Y%m%d%H%M%S).sql.gz + +$dump -h m2-slave --max_allowed_packet=64M --databases otrs | \ +pigz /srv/backups/m2-otrs-$(date +%Y%m%d%H%M%S).sql.gz + +sql=select schema_name from information_schema.schemata where schema_name regexp '^(phab|phlegal)' + +$dump -h m3-slave --ignore-table=phabricator_search.search_documentfield \ +--databases $($my $sql | tr '\n' ' ') | \ +pigz /srv/backups/m3-phabricator-phlegal-$(date +%Y%m%d%H%M%S).sql.gz + +sql=select schema_name from information_schema.schemata where schema_name regexp '^(wik|flowdb)' + +$dump -h x1-slave --databases $($my $sql | tr '\n' ' ') | \ +pigz /srv/backups/x1-$(date +%Y%m%d%H%M%S).sql.gz \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/207680 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I90ee834c2157783e79bb4118f3fe1603ec1646ca Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Mattflaschen mflasc...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] depool db1070 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/208493 Change subject: depool db1070 .. depool db1070 Change-Id: I3a9ad54889c3d1ca4af4d04e505ee3cc0fb4fe02 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/93/208493/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 21e643a..1700ba8 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -122,7 +122,7 @@ 'db1059' = 100, # 2.8TB 96GB, api 'db1064' = 500, # 2.8TB 160GB 'db1068' = 500, # 2.8TB 160GB - 'db1070' = 500, # 2.8TB 160GB + # upgrade 'db1070' = 500, # 2.8TB 160GB ), 's5' = array( 'db1058' = 0, # 2.8TB 96GB -- To view, visit https://gerrit.wikimedia.org/r/208493 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3a9ad54889c3d1ca4af4d04e505ee3cc0fb4fe02 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1068 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/208490 Change subject: repool db1068 .. repool db1068 Change-Id: I9bc73793f45d3ca5f1d08d9d6bf4fbb925115fe9 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/90/208490/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index ae424f1..21e643a 100755 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -121,7 +121,7 @@ 'db1056' = 100, # 2.8TB 96GB, api 'db1059' = 100, # 2.8TB 96GB, api 'db1064' = 500, # 2.8TB 160GB - # T91920 'db1068' = 500, # 2.8TB 160GB + 'db1068' = 500, # 2.8TB 160GB 'db1070' = 500, # 2.8TB 160GB ), 's5' = array( -- To view, visit https://gerrit.wikimedia.org/r/208490 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9bc73793f45d3ca5f1d08d9d6bf4fbb925115fe9 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] deploy db2048, db2049, db2050, db2051, db2052, db2053, db2054 - change (operations/puppet)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/208491 Change subject: deploy db2048, db2049, db2050, db2051, db2052, db2053, db2054 .. deploy db2048, db2049, db2050, db2051, db2052, db2053, db2054 Change-Id: I9a2e0a24e99a03327c7c0ef01b7a1545fbe6fc1c --- M manifests/site.pp 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/91/208491/1 diff --git a/manifests/site.pp b/manifests/site.pp index 8825cf3..84a175b 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -564,7 +564,7 @@ } } -node /^db20(16|34|42)\.codfw\.wmnet/ { +node /^db20(16|34|42|48)\.codfw\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -580,7 +580,7 @@ } } -node /^db20(17|35|41)\.codfw\.wmnet/ { +node /^db20(17|35|41|49)\.codfw\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -596,7 +596,7 @@ } } -node /^db20(18|36|43)\.codfw\.wmnet/ { +node /^db20(18|36|43|50)\.codfw\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -612,7 +612,7 @@ } } -node /^db20(19|37|44)\.codfw\.wmnet/ { +node /^db20(19|37|44|51)\.codfw\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -628,7 +628,7 @@ } } -node /^db20(23|38|45)\.codfw\.wmnet/ { +node /^db20(23|38|45|52)\.codfw\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -644,7 +644,7 @@ } } -node /^db20(28|39|46)\.codfw\.wmnet/ { +node /^db20(28|39|46|53)\.codfw\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -660,7 +660,7 @@ } } -node /^db20(29|40|47)\.codfw\.wmnet/ { +node /^db20(29|40|47|54)\.codfw\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -784,7 +784,7 @@ } # codfw db -node /^db20(4[8-9]|5[0-9]|6[0-9]|70)\.codfw\.wmnet$/ { +node /^db20(5[5-9]|6[0-9]|70)\.codfw\.wmnet$/ { $cluster = 'mysql' include standard -- To view, visit https://gerrit.wikimedia.org/r/208491 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9a2e0a24e99a03327c7c0ef01b7a1545fbe6fc1c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] deploy db2048, db2049, db2050, db2051, db2052, db2053, db2054 - change (operations/puppet)
Springle has submitted this change and it was merged. Change subject: deploy db2048, db2049, db2050, db2051, db2052, db2053, db2054 .. deploy db2048, db2049, db2050, db2051, db2052, db2053, db2054 Change-Id: I9a2e0a24e99a03327c7c0ef01b7a1545fbe6fc1c --- M manifests/site.pp 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/site.pp b/manifests/site.pp index 8825cf3..84a175b 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -564,7 +564,7 @@ } } -node /^db20(16|34|42)\.codfw\.wmnet/ { +node /^db20(16|34|42|48)\.codfw\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -580,7 +580,7 @@ } } -node /^db20(17|35|41)\.codfw\.wmnet/ { +node /^db20(17|35|41|49)\.codfw\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -596,7 +596,7 @@ } } -node /^db20(18|36|43)\.codfw\.wmnet/ { +node /^db20(18|36|43|50)\.codfw\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -612,7 +612,7 @@ } } -node /^db20(19|37|44)\.codfw\.wmnet/ { +node /^db20(19|37|44|51)\.codfw\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -628,7 +628,7 @@ } } -node /^db20(23|38|45)\.codfw\.wmnet/ { +node /^db20(23|38|45|52)\.codfw\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -644,7 +644,7 @@ } } -node /^db20(28|39|46)\.codfw\.wmnet/ { +node /^db20(28|39|46|53)\.codfw\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -660,7 +660,7 @@ } } -node /^db20(29|40|47)\.codfw\.wmnet/ { +node /^db20(29|40|47|54)\.codfw\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -784,7 +784,7 @@ } # codfw db -node /^db20(4[8-9]|5[0-9]|6[0-9]|70)\.codfw\.wmnet$/ { +node /^db20(5[5-9]|6[0-9]|70)\.codfw\.wmnet$/ { $cluster = 'mysql' include standard -- To view, visit https://gerrit.wikimedia.org/r/208491 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9a2e0a24e99a03327c7c0ef01b7a1545fbe6fc1c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] reassign db1070 to s5 - change (operations/puppet)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/208495 Change subject: reassign db1070 to s5 .. reassign db1070 to s5 Change-Id: Ia5c1c39d425082594d1c29c227a6cc34c391b68c --- M manifests/site.pp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/95/208495/1 diff --git a/manifests/site.pp b/manifests/site.pp index 84a175b..b355213 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -604,7 +604,7 @@ } } -node /^db10(42|56|59|64|68|70)\.eqiad\.wmnet/ { +node /^db10(42|56|59|64|68)\.eqiad\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -620,7 +620,7 @@ } } -node /^db10(49|71)\.eqiad\.wmnet/ { +node /^db10(49|70|71)\.eqiad\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': -- To view, visit https://gerrit.wikimedia.org/r/208495 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia5c1c39d425082594d1c29c227a6cc34c391b68c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] reassign db1070 to s5 - change (operations/puppet)
Springle has submitted this change and it was merged. Change subject: reassign db1070 to s5 .. reassign db1070 to s5 Change-Id: Ia5c1c39d425082594d1c29c227a6cc34c391b68c --- M manifests/site.pp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/site.pp b/manifests/site.pp index 84a175b..b355213 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -604,7 +604,7 @@ } } -node /^db10(42|56|59|64|68|70)\.eqiad\.wmnet/ { +node /^db10(42|56|59|64|68)\.eqiad\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -620,7 +620,7 @@ } } -node /^db10(49|71)\.eqiad\.wmnet/ { +node /^db10(49|70|71)\.eqiad\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': -- To view, visit https://gerrit.wikimedia.org/r/208495 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia5c1c39d425082594d1c29c227a6cc34c391b68c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] script used for non-replicated dbstore backups - change (operations/puppet)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/207680 Change subject: script used for non-replicated dbstore backups .. script used for non-replicated dbstore backups Bug: T95835 Change-Id: I90ee834c2157783e79bb4118f3fe1603ec1646ca --- M manifests/role/mariadb.pp A templates/mariadb/dumps-misc.sh.erb 2 files changed, 34 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/80/207680/1 diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp index 69d3694..c2f27cd 100644 --- a/manifests/role/mariadb.pp +++ b/manifests/role/mariadb.pp @@ -281,6 +281,14 @@ lag_crit = $lag_crit, warn_stopped = $warn_stopped, } + +file { '/usr/local/bin/dumps-misc.sh': +ensure = present, +owner = 'root', +group = 'root', +mode= '0755', +content = template('mariadb/dumps-misc.sh.erb'), +} } # MariaDB 10 Analytics all-shards slave, with scratch space and TokuDB diff --git a/templates/mariadb/dumps-misc.sh.erb b/templates/mariadb/dumps-misc.sh.erb new file mode 100644 index 000..6803654 --- /dev/null +++ b/templates/mariadb/dumps-misc.sh.erb @@ -0,0 +1,26 @@ +#!/bin/bash + +find /srv/backups -mtime +14 -type f -delete + +my=/usr/local/bin/mysql --skip-column-names -e +dump=/usr/local/bin/mysqldump --single-transaction --quick + +$dump -h m1-slave --databases bacula etherpadlite librenms puppet racktables rt | \ +pigz /srv/backups/m1-$(date +%Y%m%d%H%M%S).sql.gz + +$dump -h m2-slave --databases iegreview reviewdb scholarships | \ +pigz /srv/backups/m2-$(date +%Y%m%d%H%M%S).sql.gz + +$dump -h m2-slave --max_allowed_packet=64M --databases otrs | \ +pigz /srv/backups/m2-otrs-$(date +%Y%m%d%H%M%S).sql.gz + +sql=select schema_name from information_schema.schemata where schema_name regexp '^(phab|phlegal)' + +$dump -h m3-slave --ignore-table=phabricator_search.search_documentfield \ +--databases $($my $sql | tr '\n' ' ') | \ +pigz /srv/backups/m3-phabricator-phlegal-$(date +%Y%m%d%H%M%S).sql.gz + +sql=select schema_name from information_schema.schemata where schema_name regexp '^(wik|flowdb)' + +$dump -h x1-slave --databases $($my $sql | tr '\n' ' ') | \ +pigz /srv/backups/x1-$(date +%Y%m%d%H%M%S).sql.gz \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/207680 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I90ee834c2157783e79bb4118f3fe1603ec1646ca Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add codfw db servers to site.pp - change (operations/puppet)
Springle has submitted this change and it was merged. Change subject: add codfw db servers to site.pp .. add codfw db servers to site.pp Bug:T96383 Change-Id: Ib877a738db75f248498ed4baa40ac63f4dd6c585 --- M manifests/site.pp 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/site.pp b/manifests/site.pp index 4d58459..05039e8 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -790,6 +790,13 @@ include role::mariadb::tendril } +# codfw db +node /^db20(4[3-9]|5[0-9]|6[0-9]|70)\.codfw\.wmnet$/ { + +$cluster = 'mysql' +include standard +} + node 'dbstore1001.eqiad.wmnet' { $cluster = 'mysql' $ganglia_aggregator = true -- To view, visit https://gerrit.wikimedia.org/r/207336 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib877a738db75f248498ed4baa40ac63f4dd6c585 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] deploy db2043 s3, db2044 s4, db2045, s5, db2046 s6, db2047 s7 - change (operations/puppet)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/207386 Change subject: deploy db2043 s3, db2044 s4, db2045, s5, db2046 s6, db2047 s7 .. deploy db2043 s3, db2044 s4, db2045, s5, db2046 s6, db2047 s7 Change-Id: I822a0d62b29b921ef67c2c6e7f723a4905097f85 --- M manifests/site.pp 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/86/207386/1 diff --git a/manifests/site.pp b/manifests/site.pp index 05039e8..ce66f6d 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -603,7 +603,7 @@ } } -node /^db20(18|36)\.codfw\.wmnet/ { +node /^db20(18|36|43)\.codfw\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -619,7 +619,7 @@ } } -node /^db20(19|37)\.codfw\.wmnet/ { +node /^db20(19|37|44)\.codfw\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -635,7 +635,7 @@ } } -node /^db20(23|38)\.codfw\.wmnet/ { +node /^db20(23|38|45)\.codfw\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -651,7 +651,7 @@ } } -node /^db20(28|39)\.codfw\.wmnet/ { +node /^db20(28|39|46)\.codfw\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -667,7 +667,7 @@ } } -node /^db20(29|40)\.codfw\.wmnet/ { +node /^db20(29|40|47)\.codfw\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -791,7 +791,7 @@ } # codfw db -node /^db20(4[3-9]|5[0-9]|6[0-9]|70)\.codfw\.wmnet$/ { +node /^db20(4[8-9]|5[0-9]|6[0-9]|70)\.codfw\.wmnet$/ { $cluster = 'mysql' include standard -- To view, visit https://gerrit.wikimedia.org/r/207386 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I822a0d62b29b921ef67c2c6e7f723a4905097f85 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] deploy db2043 s3, db2044 s4, db2045, s5, db2046 s6, db2047 s7 - change (operations/puppet)
Springle has submitted this change and it was merged. Change subject: deploy db2043 s3, db2044 s4, db2045, s5, db2046 s6, db2047 s7 .. deploy db2043 s3, db2044 s4, db2045, s5, db2046 s6, db2047 s7 Change-Id: I822a0d62b29b921ef67c2c6e7f723a4905097f85 --- M manifests/site.pp 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/site.pp b/manifests/site.pp index 05039e8..ce66f6d 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -603,7 +603,7 @@ } } -node /^db20(18|36)\.codfw\.wmnet/ { +node /^db20(18|36|43)\.codfw\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -619,7 +619,7 @@ } } -node /^db20(19|37)\.codfw\.wmnet/ { +node /^db20(19|37|44)\.codfw\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -635,7 +635,7 @@ } } -node /^db20(23|38)\.codfw\.wmnet/ { +node /^db20(23|38|45)\.codfw\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -651,7 +651,7 @@ } } -node /^db20(28|39)\.codfw\.wmnet/ { +node /^db20(28|39|46)\.codfw\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -667,7 +667,7 @@ } } -node /^db20(29|40)\.codfw\.wmnet/ { +node /^db20(29|40|47)\.codfw\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': @@ -791,7 +791,7 @@ } # codfw db -node /^db20(4[3-9]|5[0-9]|6[0-9]|70)\.codfw\.wmnet$/ { +node /^db20(4[8-9]|5[0-9]|6[0-9]|70)\.codfw\.wmnet$/ { $cluster = 'mysql' include standard -- To view, visit https://gerrit.wikimedia.org/r/207386 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I822a0d62b29b921ef67c2c6e7f723a4905097f85 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] upgrade db1019 - change (operations/puppet)
Springle has submitted this change and it was merged. Change subject: upgrade db1019 .. upgrade db1019 Change-Id: Id561b22dbd7e51c6b6792c2e02cbcff85125ab50 --- M manifests/site.pp 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/site.pp b/manifests/site.pp index fee2cc2..d9e66b7 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -510,7 +510,7 @@ } } -node /^db10(19|38)\.eqiad\.wmnet/ { +node /^db10(38)\.eqiad\.wmnet/ { $cluster = 'mysql' class { 'role::coredb::s3': @@ -591,7 +591,7 @@ } } -node /^db10(15|27|35|44)\.eqiad\.wmnet/ { +node /^db10(15|19|27|35|44)\.eqiad\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': -- To view, visit https://gerrit.wikimedia.org/r/205533 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id561b22dbd7e51c6b6792c2e02cbcff85125ab50 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] upgrade db1019 - change (operations/puppet)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/205533 Change subject: upgrade db1019 .. upgrade db1019 Change-Id: Id561b22dbd7e51c6b6792c2e02cbcff85125ab50 --- M manifests/site.pp 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/33/205533/1 diff --git a/manifests/site.pp b/manifests/site.pp index fee2cc2..d9e66b7 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -510,7 +510,7 @@ } } -node /^db10(19|38)\.eqiad\.wmnet/ { +node /^db10(38)\.eqiad\.wmnet/ { $cluster = 'mysql' class { 'role::coredb::s3': @@ -591,7 +591,7 @@ } } -node /^db10(15|27|35|44)\.eqiad\.wmnet/ { +node /^db10(15|19|27|35|44)\.eqiad\.wmnet/ { $cluster = 'mysql' class { 'role::mariadb::core': -- To view, visit https://gerrit.wikimedia.org/r/205533 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id561b22dbd7e51c6b6792c2e02cbcff85125ab50 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] repool db1019 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/205805 Change subject: repool db1019 .. repool db1019 Change-Id: I97ba353ddea597a68752e90a31149840a711b6c4 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/05/205805/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index baee55e..131b4c7 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -108,9 +108,9 @@ ), /* s3 */ 'DEFAULT' = array( 'db1038' = 0, # 1.4TB 64GB - # upgrade 'db1019' = 0, # 1.4TB 64GB, 'db1027' = 0, # 1.4TB 64GB, vslow, dump 'db1015' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager + 'db1019' = 400, # 1.4TB 64GB 'db1035' = 400, # 1.4TB 64GB 'db1044' = 400, # 1.4TB 64GB ), -- To view, visit https://gerrit.wikimedia.org/r/205805 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I97ba353ddea597a68752e90a31149840a711b6c4 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] depool db1019 - change (operations/mediawiki-config)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/205531 Change subject: depool db1019 .. depool db1019 Change-Id: I2cfb636c222d718e5782b26f6f4950397b5c4c93 --- M wmf-config/db-eqiad.php 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/31/205531/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index a9da52d..baee55e 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -108,9 +108,9 @@ ), /* s3 */ 'DEFAULT' = array( 'db1038' = 0, # 1.4TB 64GB - 'db1019' = 0, # 1.4TB 64GB, vslow, dump + # upgrade 'db1019' = 0, # 1.4TB 64GB, + 'db1027' = 0, # 1.4TB 64GB, vslow, dump 'db1015' = 0, # 1.4TB 64GB, watchlist, recentchanges, contributions, logpager - 'db1027' = 400, # 1.4TB 64GB 'db1035' = 400, # 1.4TB 64GB 'db1044' = 400, # 1.4TB 64GB ), @@ -219,10 +219,10 @@ ), /* s3 */ 'DEFAULT' = array( 'vslow' = array( - 'db1019' = 1, + 'db1027' = 1, ), 'dump' = array( - 'db1019' = 1, + 'db1027' = 1, ), 'watchlist' = array( 'db1015' = 1, -- To view, visit https://gerrit.wikimedia.org/r/205531 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2cfb636c222d718e5782b26f6f4950397b5c4c93 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add missing .erb extension - change (operations/puppet)
Springle has submitted this change and it was merged. Change subject: Add missing .erb extension .. Add missing .erb extension Change-Id: I64e6f09748f2e42192df0afb022f5751b4f6ff27 --- R templates/mariadb/toolsmaster.my.cnf.erb 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/mariadb/toolsmaster.my.cnf b/templates/mariadb/toolsmaster.my.cnf.erb similarity index 100% rename from templates/mariadb/toolsmaster.my.cnf rename to templates/mariadb/toolsmaster.my.cnf.erb -- To view, visit https://gerrit.wikimedia.org/r/204434 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I64e6f09748f2e42192df0afb022f5751b4f6ff27 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add missing .erb extension - change (operations/puppet)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/204434 Change subject: Add missing .erb extension .. Add missing .erb extension Change-Id: I64e6f09748f2e42192df0afb022f5751b4f6ff27 --- R templates/mariadb/toolsmaster.my.cnf.erb 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/34/204434/1 diff --git a/templates/mariadb/toolsmaster.my.cnf b/templates/mariadb/toolsmaster.my.cnf.erb similarity index 100% rename from templates/mariadb/toolsmaster.my.cnf rename to templates/mariadb/toolsmaster.my.cnf.erb -- To view, visit https://gerrit.wikimedia.org/r/204434 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I64e6f09748f2e42192df0afb022f5751b4f6ff27 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Labs: puppetize labsdb1005's mysql setup - change (operations/puppet)
Springle has submitted this change and it was merged. Change subject: Labs: puppetize labsdb1005's mysql setup .. Labs: puppetize labsdb1005's mysql setup This mostly replicates the current config, but brings it in to the standard for passwords, etc. Bug: T88234 Change-Id: I8ce32a37aa517baa9d21ef9bb9d03f50ea9917ef --- M manifests/role/labsdb.pp M manifests/site.pp A templates/mariadb/toolsmaster.my.cnf 3 files changed, 80 insertions(+), 54 deletions(-) Approvals: Springle: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/role/labsdb.pp b/manifests/role/labsdb.pp index eecc679..ee460ad 100644 --- a/manifests/role/labsdb.pp +++ b/manifests/role/labsdb.pp @@ -2,60 +2,21 @@ class role::labs::db::master { -system::role { 'role::labs::db::master': description = Labs user database master } - -class { 'mysql::server': -config_hash = { -'datadir' = '/srv/labsdb', -'port'= '3306', -'bind_address'= '0.0.0.0', -'max_connections' = '4096', - -'server-id' = '1', -'report_host' = 'labsdbmaster', -'log_bin' = true, -'max_binlog_size' = '100M', - -'innodb_log_file_size'= '64M', -'innodb_buffer_pool_size' = '13G', -'innodb_log_buffer_size' = '64M', -'innodb_file_per_table' = '1', -'innodb_open_files' = '512', -'innodb_flush_method' = 'O_DIRECT', - -# More tuning will certainly be needed -} +system::role { 'role::labs::db::master': +description = 'Labs user database master', } -} +include standard +include mariadb::packages_wmf +include role::mariadb::grants +include role::mariadb::monitor -class role::labs::db::slave { - -system::role { 'role::labs::db::slave': description = Labs user database slave } - -class { 'mysql::server': -config_hash = { -'datadir' = '/srv/labsdb', -'port'= '3306', -'bind_address'= '0.0.0.0', -'max_connections' = '4096', - -'server-id' = '2', -'report_host' = 'labsdbslave', -'log_bin' = true, -'max_binlog_size' = '100M', -'relay_log' = '/srv/labsdb/relay', -'relay_log_index' = '/srv/labsdb/relay.index', -'relay_log_info_file' = '/srv/labsdb/relay.info', - -'innodb_log_file_size'= '64M', -'innodb_buffer_pool_size' = '13G', -'innodb_log_buffer_size' = '64M', -'innodb_file_per_table' = '1', -'innodb_open_files' = '512', -'innodb_flush_method' = 'O_DIRECT', - -# More tuning will certainly be needed -} +class { 'mariadb::config': +prompt = 'TOOLSDB', +config = 'mariadb/toolsmaster.my.cnf.erb', +password = $passwords::misc::scripts::mysql_root_pass, +datadir = '/srv/labsdb/data', +tmpdir = '/tmp', } + } diff --git a/manifests/site.pp b/manifests/site.pp index 645b6a8..480c3f2 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1222,14 +1222,14 @@ $postgres_slave_v4 = '10.64.37.9' include role::postgres::master -# include role::labs::db::slave +# role labs::db::slave } node 'labsdb1005.eqiad.wmnet' { $postgres_master = 'labsdb1004.eqiad.wmnet' include role::postgres::slave -# include role::labs::db::master +role labs::db::master } node 'labsdb1006.eqiad.wmnet' { diff --git a/templates/mariadb/toolsmaster.my.cnf b/templates/mariadb/toolsmaster.my.cnf new file mode 100644 index 000..e5621c6 --- /dev/null +++ b/templates/mariadb/toolsmaster.my.cnf @@ -0,0 +1,65 @@ +[client] +port = 3306 +socket = /var/run/mysqld/mysqld.sock + +[mysqld] + +user = mysql +socket = /var/run/mysqld/mysqld.sock +port = 3306 +datadir= %= @datadir % +tmpdir = %= @tmpdir % +server_id = %= @server_id % +read_only = 0 + +log_bin = /srv/labsdb/binlogs/log +log_bin_index = /srv/labsdb/binlogs/log.index +log_slave_updates + +skip-external-locking +skip-name-resolve +temp-pool + +max_connections= 1024 +max_connect_errors = 10 +max_allowed_packet = 16M +connect_timeout= 5 +query_cache_size = 0 +query_cache_type = 0 +event_scheduler= 1 +userstat = 1 +log-warnings = 0 +thread_stack = 192K +thread_cache_size = 128 +interactive_timeout= 28800
[MediaWiki-commits] [Gerrit] Lowered max lag to 15 - change (operations/mediawiki-config)
Springle has submitted this change and it was merged. Change subject: Lowered max lag to 15 .. Lowered max lag to 15 Change-Id: I02b1789095122e405ffa3f655af791dac0038c0a --- M wmf-config/db-codfw.php M wmf-config/db-eqiad.php 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Springle: Looks good to me, approved diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index c609cc0..1dc6a1f 100644 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -134,7 +134,7 @@ 'password'= $wgDBpassword, 'type'= 'mysql', 'flags' = DBO_DEFAULT, - 'max lag' = 20 + 'max lag' = 15 ), 'groupLoadsBySection' = array(), diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 4bcb118..f0ebaba 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -159,7 +159,7 @@ 'password'= $wgDBpassword, 'type'= 'mysql', 'flags' = DBO_DEFAULT, - 'max lag' = 20 + 'max lag' = 15 ), 'groupLoadsBySection' = array( -- To view, visit https://gerrit.wikimedia.org/r/203508 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I02b1789095122e405ffa3f655af791dac0038c0a Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: Springle sprin...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] assign db2041 to s2 - change (operations/puppet)
Springle has uploaded a new change for review. https://gerrit.wikimedia.org/r/202686 Change subject: assign db2041 to s2 .. assign db2041 to s2 Change-Id: I4640c7bca758b7ed6baea7b2c212846c4b8cc69e --- M manifests/site.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/86/202686/1 diff --git a/manifests/site.pp b/manifests/site.pp index e5ab96f..33977a6 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -620,7 +620,7 @@ } } -node /^db20(17|35)\.codfw\.wmnet/ { +node /^db20(17|35|41)\.codfw\.wmnet/ { include admin $cluster = 'mysql' -- To view, visit https://gerrit.wikimedia.org/r/202686 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4640c7bca758b7ed6baea7b2c212846c4b8cc69e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Springle sprin...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits