[MediaWiki-commits] [Gerrit] pulling db1021 for upgrade - change (operations/mediawiki-config)
Asher has submitted this change and it was merged. Change subject: pulling db1021 for upgrade .. pulling db1021 for upgrade Change-Id: I0e2e5691ed279e3120ee3bbb34a990b958350e15 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Asher: Verified; Looks good to me, approved diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 933fd5e..8262121 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -117,7 +117,7 @@ 'db1039' => 0, 'db1005' => 100, # snapshot 'db1026' => 400, - 'db1021' => 400, + #'db1021' => 400, ), 's6' => array( 'db1006' => 0, -- To view, visit https://gerrit.wikimedia.org/r/57766 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0e2e5691ed279e3120ee3bbb34a990b958350e15 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher Gerrit-Reviewer: Asher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pulling db1021 for upgrade - change (operations/mediawiki-config)
Asher has uploaded a new change for review. https://gerrit.wikimedia.org/r/57766 Change subject: pulling db1021 for upgrade .. pulling db1021 for upgrade Change-Id: I0e2e5691ed279e3120ee3bbb34a990b958350e15 --- 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/57766/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 933fd5e..8262121 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -117,7 +117,7 @@ 'db1039' => 0, 'db1005' => 100, # snapshot 'db1026' => 400, - 'db1021' => 400, + #'db1021' => 400, ), 's6' => array( 'db1006' => 0, -- To view, visit https://gerrit.wikimedia.org/r/57766 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0e2e5691ed279e3120ee3bbb34a990b958350e15 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] converting db1021 to mariadb, adding db1058 to s1 for testin... - change (operations/puppet)
Asher has submitted this change and it was merged.
Change subject: converting db1021 to mariadb, adding db1058 to s1 for testing
only
..
converting db1021 to mariadb, adding db1058 to s1 for testing only
Change-Id: I591f7b1eb5173e3c519526a32cd67daa0e4c5842
---
M manifests/site.pp
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Asher: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 6cadfc1..7e7e718 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -519,8 +519,8 @@
}
# eqiad dbs
-node /^db10(01|17|42|43|49|50|51|52|56)\.eqiad\.wmnet/ {
- if $hostname =~ /^db10(01|17)/ {
+node /^db10(01|17|42|43|49|50|51|52|56|58)\.eqiad\.wmnet/ {
+ if $hostname =~ /^db10(01|17|56)/ {
$ganglia_aggregator = "true"
include mha::manager
}
@@ -563,7 +563,7 @@
$ganglia_aggregator = "true"
}
- if $hostname == "db1026" {
+ if $hostname =~ /^db10(21|26)/ {
class { role::coredb::s5 : mariadb => true }
} else {
include role::coredb::s5
--
To view, visit https://gerrit.wikimedia.org/r/57765
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I591f7b1eb5173e3c519526a32cd67daa0e4c5842
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
Gerrit-Reviewer: Asher
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] converting db1021 to mariadb, adding db1058 to s1 for testin... - change (operations/puppet)
Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57765
Change subject: converting db1021 to mariadb, adding db1058 to s1 for testing
only
..
converting db1021 to mariadb, adding db1058 to s1 for testing only
Change-Id: I591f7b1eb5173e3c519526a32cd67daa0e4c5842
---
M manifests/site.pp
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/65/57765/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 6cadfc1..eece947 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -519,8 +519,8 @@
}
# eqiad dbs
-node /^db10(01|17|42|43|49|50|51|52|56)\.eqiad\.wmnet/ {
- if $hostname =~ /^db10(01|17)/ {
+node /^db10(01|17|42|43|49|50|51|52|56|58)\.eqiad\.wmnet/ {
+ if $hostname =~ /^db10(01|17|56)/ {
$ganglia_aggregator = "true"
include mha::manager
}
@@ -563,7 +563,7 @@
$ganglia_aggregator = "true"
}
- if $hostname == "db1026" {
+ } elsif $hostname =~ /^db10(21|26)/ {
class { role::coredb::s5 : mariadb => true }
} else {
include role::coredb::s5
--
To view, visit https://gerrit.wikimedia.org/r/57765
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I591f7b1eb5173e3c519526a32cd67daa0e4c5842
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] converting db1050 (s1 snapshot) to mariadb and file-per-table - change (operations/puppet)
Asher has submitted this change and it was merged.
Change subject: converting db1050 (s1 snapshot) to mariadb and file-per-table
..
converting db1050 (s1 snapshot) to mariadb and file-per-table
Change-Id: I3c9fad11dc5df8daae4dad11104b30c335a217f7
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Asher: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index d7dba22..6cadfc1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -525,7 +525,7 @@
include mha::manager
}
- if $hostname =~ /^db10(51|52|56)/ {
+ if $hostname =~ /^db10(50|51|52|56)/ {
class { role::coredb::s1 : innodb_file_per_table => true,
mariadb => true }
} elsif $hostname =~ /^db10(43|49)/ {
class { role::coredb::s1 : mariadb => true }
--
To view, visit https://gerrit.wikimedia.org/r/57760
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3c9fad11dc5df8daae4dad11104b30c335a217f7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
Gerrit-Reviewer: Asher
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] converting db1050 (s1 snapshot) to mariadb and file-per-table - change (operations/puppet)
Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57760
Change subject: converting db1050 (s1 snapshot) to mariadb and file-per-table
..
converting db1050 (s1 snapshot) to mariadb and file-per-table
Change-Id: I3c9fad11dc5df8daae4dad11104b30c335a217f7
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/60/57760/1
diff --git a/manifests/site.pp b/manifests/site.pp
index d7dba22..6cadfc1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -525,7 +525,7 @@
include mha::manager
}
- if $hostname =~ /^db10(51|52|56)/ {
+ if $hostname =~ /^db10(50|51|52|56)/ {
class { role::coredb::s1 : innodb_file_per_table => true,
mariadb => true }
} elsif $hostname =~ /^db10(43|49)/ {
class { role::coredb::s1 : mariadb => true }
--
To view, visit https://gerrit.wikimedia.org/r/57760
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c9fad11dc5df8daae4dad11104b30c335a217f7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] s1: moving watchlist to db1049, pulling db1043, adding db1056 - change (operations/mediawiki-config)
Asher has submitted this change and it was merged. Change subject: s1: moving watchlist to db1049, pulling db1043, adding db1056 .. s1: moving watchlist to db1049, pulling db1043, adding db1056 Change-Id: I93b5253bbe63e6039b551c616ea921a197014bbf --- M wmf-config/db-eqiad.php 1 file changed, 10 insertions(+), 10 deletions(-) Approvals: Asher: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 65c93c5..933fd5e 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -85,15 +85,15 @@ # 'sectionLoads' => array( 's1' => array( - 'db1017'=> 0, # 1.4TB + 'db1017'=> 0, # 1.4TB 64GB #'db1001'=> 100, # 1.4TB sas - 'db1042'=> 400, # 1.4TB sas - 'db1043'=> 400, # 1.4TB sas, normall special contrib, watchlist, etc 64GB - 'db1049'=> 50, # 2.8TB sas 64GB future watchlist - 'db1050'=> 50, # snapshot 2.8TB sas 64GB + 'db1042'=> 400, # 1.4TB sas 64GB + #'db1043'=> 400, # 1.4TB sas 64GB + 'db1049'=> 50, # 2.8TB sas 64GB watchlist + #'db1050'=> 50, # snapshot 2.8TB sas 64GB 'db1051'=> 400, # 2.8TB sas 96GB - 'db1052'=> 50, # 2.8TB sas 96GB - #'db1056'=> 400, # 2.8TB sas 96GB future master + 'db1052'=> 400, # 2.8TB sas 96GB + 'db1056'=> 400, # 2.8TB sas 96GB future master ), 's2' => array( 'db1034'=> 0, @@ -157,13 +157,13 @@ 'groupLoadsByDB' => array( 'enwiki' => array( 'watchlist' => array( - 'db1052' => 1, + 'db1049' => 1, ), 'recentchangeslinked' => array( - 'db1052' => 1, + 'db1049' => 1, ), 'contributions' => array( - 'db1052' => 1, + 'db1049' => 1, ), 'dump' => array( 'db1052' => 1, -- To view, visit https://gerrit.wikimedia.org/r/57758 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I93b5253bbe63e6039b551c616ea921a197014bbf Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher Gerrit-Reviewer: Asher Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] s1: moving watchlist to db1049, pulling db1043, adding db1056 - change (operations/mediawiki-config)
Asher has uploaded a new change for review. https://gerrit.wikimedia.org/r/57758 Change subject: s1: moving watchlist to db1049, pulling db1043, adding db1056 .. s1: moving watchlist to db1049, pulling db1043, adding db1056 Change-Id: I93b5253bbe63e6039b551c616ea921a197014bbf --- M wmf-config/db-eqiad.php 1 file changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/58/57758/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 65c93c5..933fd5e 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -85,15 +85,15 @@ # 'sectionLoads' => array( 's1' => array( - 'db1017'=> 0, # 1.4TB + 'db1017'=> 0, # 1.4TB 64GB #'db1001'=> 100, # 1.4TB sas - 'db1042'=> 400, # 1.4TB sas - 'db1043'=> 400, # 1.4TB sas, normall special contrib, watchlist, etc 64GB - 'db1049'=> 50, # 2.8TB sas 64GB future watchlist - 'db1050'=> 50, # snapshot 2.8TB sas 64GB + 'db1042'=> 400, # 1.4TB sas 64GB + #'db1043'=> 400, # 1.4TB sas 64GB + 'db1049'=> 50, # 2.8TB sas 64GB watchlist + #'db1050'=> 50, # snapshot 2.8TB sas 64GB 'db1051'=> 400, # 2.8TB sas 96GB - 'db1052'=> 50, # 2.8TB sas 96GB - #'db1056'=> 400, # 2.8TB sas 96GB future master + 'db1052'=> 400, # 2.8TB sas 96GB + 'db1056'=> 400, # 2.8TB sas 96GB future master ), 's2' => array( 'db1034'=> 0, @@ -157,13 +157,13 @@ 'groupLoadsByDB' => array( 'enwiki' => array( 'watchlist' => array( - 'db1052' => 1, + 'db1049' => 1, ), 'recentchangeslinked' => array( - 'db1052' => 1, + 'db1049' => 1, ), 'contributions' => array( - 'db1052' => 1, + 'db1049' => 1, ), 'dump' => array( 'db1052' => 1, -- To view, visit https://gerrit.wikimedia.org/r/57758 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I93b5253bbe63e6039b551c616ea921a197014bbf Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] raising default max_connections (was previously lowered from... - change (operations/puppet)
Asher has submitted this change and it was merged. Change subject: raising default max_connections (was previously lowered from 5000) .. raising default max_connections (was previously lowered from 5000) Change-Id: I425283a6e44bc756a53f3252cb618adca33025a8 --- M modules/coredb_mysql/templates/prod.my.cnf.erb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Asher: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/modules/coredb_mysql/templates/prod.my.cnf.erb b/modules/coredb_mysql/templates/prod.my.cnf.erb index 50146aa..fc017bc 100644 --- a/modules/coredb_mysql/templates/prod.my.cnf.erb +++ b/modules/coredb_mysql/templates/prod.my.cnf.erb @@ -35,7 +35,7 @@ thread_stack = 192K thread_cache_size = 300 -max_connections= 1000 +max_connections= 2500 table_open_cache= 5 table_definition_cache = 4 -- To view, visit https://gerrit.wikimedia.org/r/57679 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I425283a6e44bc756a53f3252cb618adca33025a8 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Asher Gerrit-Reviewer: Asher Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] raising default max_connections (was previously lowered from... - change (operations/puppet)
Asher has uploaded a new change for review. https://gerrit.wikimedia.org/r/57679 Change subject: raising default max_connections (was previously lowered from 5000) .. raising default max_connections (was previously lowered from 5000) Change-Id: I425283a6e44bc756a53f3252cb618adca33025a8 --- M modules/coredb_mysql/templates/prod.my.cnf.erb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/79/57679/1 diff --git a/modules/coredb_mysql/templates/prod.my.cnf.erb b/modules/coredb_mysql/templates/prod.my.cnf.erb index 50146aa..fc017bc 100644 --- a/modules/coredb_mysql/templates/prod.my.cnf.erb +++ b/modules/coredb_mysql/templates/prod.my.cnf.erb @@ -35,7 +35,7 @@ thread_stack = 192K thread_cache_size = 300 -max_connections= 1000 +max_connections= 2500 table_open_cache= 5 table_definition_cache = 4 -- To view, visit https://gerrit.wikimedia.org/r/57679 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I425283a6e44bc756a53f3252cb618adca33025a8 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Asher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] cpufrequtils shouldn't be treated as a service, except to st... - change (operations/puppet)
Asher has submitted this change and it was merged.
Change subject: cpufrequtils shouldn't be treated as a service, except to start
at boot
..
cpufrequtils shouldn't be treated as a service, except to start at boot
Change-Id: Iad5c63ed5ad6cde5f3299a7768d0c31df64abd99
---
M modules/cpufrequtils/manifests/init.pp
1 file changed, 10 insertions(+), 5 deletions(-)
Approvals:
Asher: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/cpufrequtils/manifests/init.pp
b/modules/cpufrequtils/manifests/init.pp
index 8bfcc51..03988b0 100644
--- a/modules/cpufrequtils/manifests/init.pp
+++ b/modules/cpufrequtils/manifests/init.pp
@@ -13,15 +13,20 @@
ensure => present;
}
+ # start at boot
+ service { 'cpufrequtils':
+ enable => true,
+ require => Package['cpufrequtils'],
+ }
+
file { '/etc/default/cpufrequtils':
content => "GOVERNOR=${governor}\n",
+ notify => Exec['apply cpufrequtils'],
require => Package['cpufrequtils'];
}
- service { 'cpufrequtils':
- enable => true,
- hasstatus => false,
- require => Package['cpufrequtils'],
- subscribe => File['/etc/default/cpufrequtils'];
+ exec { 'apply cpufrequtils':
+ command => '/etc/init.d/cpufrequtils start',
+ refreshonly => true
}
}
--
To view, visit https://gerrit.wikimedia.org/r/57667
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iad5c63ed5ad6cde5f3299a7768d0c31df64abd99
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
Gerrit-Reviewer: Asher
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] cpufrequtils shouldn't be treated as a service, except to st... - change (operations/puppet)
Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57667
Change subject: cpufrequtils shouldn't be treated as a service, except to start
at boot
..
cpufrequtils shouldn't be treated as a service, except to start at boot
Change-Id: Iad5c63ed5ad6cde5f3299a7768d0c31df64abd99
---
M modules/cpufrequtils/manifests/init.pp
1 file changed, 10 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/67/57667/1
diff --git a/modules/cpufrequtils/manifests/init.pp
b/modules/cpufrequtils/manifests/init.pp
index 8bfcc51..03988b0 100644
--- a/modules/cpufrequtils/manifests/init.pp
+++ b/modules/cpufrequtils/manifests/init.pp
@@ -13,15 +13,20 @@
ensure => present;
}
+ # start at boot
+ service { 'cpufrequtils':
+ enable => true,
+ require => Package['cpufrequtils'],
+ }
+
file { '/etc/default/cpufrequtils':
content => "GOVERNOR=${governor}\n",
+ notify => Exec['apply cpufrequtils'],
require => Package['cpufrequtils'];
}
- service { 'cpufrequtils':
- enable => true,
- hasstatus => false,
- require => Package['cpufrequtils'],
- subscribe => File['/etc/default/cpufrequtils'];
+ exec { 'apply cpufrequtils':
+ command => '/etc/init.d/cpufrequtils start',
+ refreshonly => true
}
}
--
To view, visit https://gerrit.wikimedia.org/r/57667
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad5c63ed5ad6cde5f3299a7768d0c31df64abd99
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] lack of status from init.d/cpufrequitls breaks file change -... - change (operations/puppet)
Asher has submitted this change and it was merged.
Change subject: lack of status from init.d/cpufrequitls breaks file change ->
service refresh
..
lack of status from init.d/cpufrequitls breaks file change -> service refresh
Change-Id: I7c5c39cb15b5a1fdfb0da056f673abc720779387
---
M modules/cpufrequtils/manifests/init.pp
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Asher: Verified; Looks good to me, approved
diff --git a/modules/cpufrequtils/manifests/init.pp
b/modules/cpufrequtils/manifests/init.pp
index 008e07e..8bfcc51 100644
--- a/modules/cpufrequtils/manifests/init.pp
+++ b/modules/cpufrequtils/manifests/init.pp
@@ -20,6 +20,7 @@
service { 'cpufrequtils':
enable => true,
+ hasstatus => false,
require => Package['cpufrequtils'],
subscribe => File['/etc/default/cpufrequtils'];
}
--
To view, visit https://gerrit.wikimedia.org/r/57661
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7c5c39cb15b5a1fdfb0da056f673abc720779387
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
Gerrit-Reviewer: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] lack of status from init.d/cpufrequitls breaks file change -... - change (operations/puppet)
Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57661
Change subject: lack of status from init.d/cpufrequitls breaks file change ->
service refresh
..
lack of status from init.d/cpufrequitls breaks file change -> service refresh
Change-Id: I7c5c39cb15b5a1fdfb0da056f673abc720779387
---
M modules/cpufrequtils/manifests/init.pp
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/61/57661/1
diff --git a/modules/cpufrequtils/manifests/init.pp
b/modules/cpufrequtils/manifests/init.pp
index 008e07e..8bfcc51 100644
--- a/modules/cpufrequtils/manifests/init.pp
+++ b/modules/cpufrequtils/manifests/init.pp
@@ -20,6 +20,7 @@
service { 'cpufrequtils':
enable => true,
+ hasstatus => false,
require => Package['cpufrequtils'],
subscribe => File['/etc/default/cpufrequtils'];
}
--
To view, visit https://gerrit.wikimedia.org/r/57661
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c5c39cb15b5a1fdfb0da056f673abc720779387
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] setting cpu frequency governor to performance on all coredbs - change (operations/puppet)
Asher has submitted this change and it was merged.
Change subject: setting cpu frequency governor to performance on all coredbs
..
setting cpu frequency governor to performance on all coredbs
Change-Id: I8a98963489c109f6d68c4265f7d5e6f5d7363ba8
---
M manifests/role/coredb.pp
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Asher: Verified; Looks good to me, approved
diff --git a/manifests/role/coredb.pp b/manifests/role/coredb.pp
index 1365f0f..85d5c2b 100644
--- a/manifests/role/coredb.pp
+++ b/manifests/role/coredb.pp
@@ -269,7 +269,8 @@
include standard,
mysql_wmf::coredb::ganglia,
- mha::node
+ mha::node,
+ cpufrequtils
if $masters[$::site] == $::hostname
and ( $primary_site == $::site or $primary_site == 'both' ){
--
To view, visit https://gerrit.wikimedia.org/r/57660
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8a98963489c109f6d68c4265f7d5e6f5d7363ba8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
Gerrit-Reviewer: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] setting cpu frequency governor to performance on all coredbs - change (operations/puppet)
Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57660
Change subject: setting cpu frequency governor to performance on all coredbs
..
setting cpu frequency governor to performance on all coredbs
Change-Id: I8a98963489c109f6d68c4265f7d5e6f5d7363ba8
---
M manifests/role/coredb.pp
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/60/57660/1
diff --git a/manifests/role/coredb.pp b/manifests/role/coredb.pp
index 1365f0f..85d5c2b 100644
--- a/manifests/role/coredb.pp
+++ b/manifests/role/coredb.pp
@@ -269,7 +269,8 @@
include standard,
mysql_wmf::coredb::ganglia,
- mha::node
+ mha::node,
+ cpufrequtils
if $masters[$::site] == $::hostname
and ( $primary_site == $::site or $primary_site == 'both' ){
--
To view, visit https://gerrit.wikimedia.org/r/57660
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a98963489c109f6d68c4265f7d5e6f5d7363ba8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] module sets cpu frequency governor via cpufrequtils - change (operations/puppet)
Asher has submitted this change and it was merged.
Change subject: module sets cpu frequency governor via cpufrequtils
..
module sets cpu frequency governor via cpufrequtils
Change-Id: I0cef4548931e007321f1486f5fa6344d7ddc2c0f
---
A modules/cpufrequtils/manifests/init.pp
1 file changed, 26 insertions(+), 0 deletions(-)
Approvals:
Asher: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/cpufrequtils/manifests/init.pp
b/modules/cpufrequtils/manifests/init.pp
new file mode 100644
index 000..008e07e
--- /dev/null
+++ b/modules/cpufrequtils/manifests/init.pp
@@ -0,0 +1,26 @@
+class cpufrequtils (
+ $governor = 'performance',
+) {
+ case $::operatingsystem {
+ debian, ubuntu: {
+ }
+ default: {
+ fail("Module ${module_name} is not supported on
${::operatingsystem}")
+ }
+ }
+
+ package { 'cpufrequtils':
+ ensure => present;
+ }
+
+ file { '/etc/default/cpufrequtils':
+ content => "GOVERNOR=${governor}\n",
+ require => Package['cpufrequtils'];
+ }
+
+ service { 'cpufrequtils':
+ enable => true,
+ require => Package['cpufrequtils'],
+ subscribe => File['/etc/default/cpufrequtils'];
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/57589
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0cef4548931e007321f1486f5fa6344d7ddc2c0f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
Gerrit-Reviewer: Asher
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] module sets cpu frequency governor via cpufrequtils - change (operations/puppet)
Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57589
Change subject: module sets cpu frequency governor via cpufrequtils
..
module sets cpu frequency governor via cpufrequtils
Change-Id: I0cef4548931e007321f1486f5fa6344d7ddc2c0f
---
A modules/cpufrequtils/manifests/init.pp
1 file changed, 26 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/89/57589/1
diff --git a/modules/cpufrequtils/manifests/init.pp
b/modules/cpufrequtils/manifests/init.pp
new file mode 100644
index 000..7ac4f1f
--- /dev/null
+++ b/modules/cpufrequtils/manifests/init.pp
@@ -0,0 +1,26 @@
+class cpufrequtils (
+ $governor = "performance",
+) {
+ case $::operatingsystem {
+ debian, ubuntu: {
+ }
+ default: {
+ fail("Module ${module_name} is not supported on
${::operatingsystem}")
+ }
+ }
+
+ package { 'cpufrequtils':
+ ensure => present;
+ }
+
+ file { '/etc/default/cpufrequtils':
+ content => "GOVERNOR=${governor}",
+ require => Package['cpufrequtils'];
+ }
+
+ service { 'cpufrequtils':
+ enable => true,
+ require => Package['cpufrequtils'],
+ subscribe => File["/etc/default/cpufrequtils"];
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/57589
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cef4548931e007321f1486f5fa6344d7ddc2c0f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] returning db1028 to service - change (operations/mediawiki-config)
Asher has submitted this change and it was merged. Change subject: returning db1028 to service .. returning db1028 to service Change-Id: I450295e7e812c0eb3055097c48787e63d93286b8 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Asher: Verified; Looks good to me, approved diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index fc3ce69..c01b462 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -124,7 +124,7 @@ 'db1041' => 0, 'db1007' => 100, # snapshot 'db1024' => 400, - #'db1028' => 400, + 'db1028' => 400, ), ), -- To view, visit https://gerrit.wikimedia.org/r/57191 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I450295e7e812c0eb3055097c48787e63d93286b8 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher Gerrit-Reviewer: Asher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] returning db1028 to service - change (operations/mediawiki-config)
Asher has uploaded a new change for review. https://gerrit.wikimedia.org/r/57191 Change subject: returning db1028 to service .. returning db1028 to service Change-Id: I450295e7e812c0eb3055097c48787e63d93286b8 --- 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/91/57191/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index fc3ce69..c01b462 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -124,7 +124,7 @@ 'db1041' => 0, 'db1007' => 100, # snapshot 'db1024' => 400, - #'db1028' => 400, + 'db1028' => 400, ), ), -- To view, visit https://gerrit.wikimedia.org/r/57191 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I450295e7e812c0eb3055097c48787e63d93286b8 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] moving s1 watchlist to db1052, putting db1043 to full weight - change (operations/mediawiki-config)
Asher has submitted this change and it was merged. Change subject: moving s1 watchlist to db1052, putting db1043 to full weight .. moving s1 watchlist to db1052, putting db1043 to full weight Change-Id: I9cab5ae1d96eadc15ca07800b752e7d7937f8d69 --- M wmf-config/db-eqiad.php 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Asher: Verified; Looks good to me, approved diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 176533b..fc3ce69 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -83,11 +83,11 @@ 'db1017'=> 0, # 1.4TB #'db1001'=> 100, # 1.4TB sas 'db1042'=> 400, # 1.4TB sas - 'db1043'=> 50, # 1.4TB sas, special contrib, watchlist, etc 64GB + 'db1043'=> 400, # 1.4TB sas, normall special contrib, watchlist, etc 64GB 'db1049'=> 50, # 2.8TB sas 64GB future watchlist 'db1050'=> 50, # snapshot 2.8TB sas 64GB 'db1051'=> 400, # 2.8TB sas 96GB - 'db1052'=> 400, # 2.8TB sas 96GB + 'db1052'=> 50, # 2.8TB sas 96GB #'db1056'=> 400, # 2.8TB sas 96GB future master ), 's2' => array( @@ -152,16 +152,16 @@ 'groupLoadsByDB' => array( 'enwiki' => array( 'watchlist' => array( - 'db1043' => 1, + 'db1052' => 1, ), 'recentchangeslinked' => array( - 'db1043' => 1, + 'db1052' => 1, ), 'contributions' => array( - 'db1043' => 1, + 'db1052' => 1, ), 'dump' => array( - 'db1043' => 1, + 'db1052' => 1, ), ), ), -- To view, visit https://gerrit.wikimedia.org/r/57174 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9cab5ae1d96eadc15ca07800b752e7d7937f8d69 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher Gerrit-Reviewer: Asher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] moving s1 watchlist to db1052, putting db1043 to full weight - change (operations/mediawiki-config)
Asher has uploaded a new change for review. https://gerrit.wikimedia.org/r/57174 Change subject: moving s1 watchlist to db1052, putting db1043 to full weight .. moving s1 watchlist to db1052, putting db1043 to full weight Change-Id: I9cab5ae1d96eadc15ca07800b752e7d7937f8d69 --- M wmf-config/db-eqiad.php 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/74/57174/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 176533b..fc3ce69 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -83,11 +83,11 @@ 'db1017'=> 0, # 1.4TB #'db1001'=> 100, # 1.4TB sas 'db1042'=> 400, # 1.4TB sas - 'db1043'=> 50, # 1.4TB sas, special contrib, watchlist, etc 64GB + 'db1043'=> 400, # 1.4TB sas, normall special contrib, watchlist, etc 64GB 'db1049'=> 50, # 2.8TB sas 64GB future watchlist 'db1050'=> 50, # snapshot 2.8TB sas 64GB 'db1051'=> 400, # 2.8TB sas 96GB - 'db1052'=> 400, # 2.8TB sas 96GB + 'db1052'=> 50, # 2.8TB sas 96GB #'db1056'=> 400, # 2.8TB sas 96GB future master ), 's2' => array( @@ -152,16 +152,16 @@ 'groupLoadsByDB' => array( 'enwiki' => array( 'watchlist' => array( - 'db1043' => 1, + 'db1052' => 1, ), 'recentchangeslinked' => array( - 'db1043' => 1, + 'db1052' => 1, ), 'contributions' => array( - 'db1043' => 1, + 'db1052' => 1, ), 'dump' => array( - 'db1043' => 1, + 'db1052' => 1, ), ), ), -- To view, visit https://gerrit.wikimedia.org/r/57174 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9cab5ae1d96eadc15ca07800b752e7d7937f8d69 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pulling db1001 - change (operations/mediawiki-config)
Asher has submitted this change and it was merged. Change subject: pulling db1001 .. pulling db1001 Change-Id: I0d06c187a6a86284dd8e0a8459b3fa4a8e9640b6 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Asher: Verified; Looks good to me, approved diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 9d2d8f8..176533b 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -81,7 +81,7 @@ 'sectionLoads' => array( 's1' => array( 'db1017'=> 0, # 1.4TB - 'db1001'=> 100, # 1.4TB sas + #'db1001'=> 100, # 1.4TB sas 'db1042'=> 400, # 1.4TB sas 'db1043'=> 50, # 1.4TB sas, special contrib, watchlist, etc 64GB 'db1049'=> 50, # 2.8TB sas 64GB future watchlist -- To view, visit https://gerrit.wikimedia.org/r/57169 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0d06c187a6a86284dd8e0a8459b3fa4a8e9640b6 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher Gerrit-Reviewer: Asher Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pulling db1001 - change (operations/mediawiki-config)
Asher has uploaded a new change for review. https://gerrit.wikimedia.org/r/57169 Change subject: pulling db1001 .. pulling db1001 Change-Id: I0d06c187a6a86284dd8e0a8459b3fa4a8e9640b6 --- 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/57169/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 9d2d8f8..176533b 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -81,7 +81,7 @@ 'sectionLoads' => array( 's1' => array( 'db1017'=> 0, # 1.4TB - 'db1001'=> 100, # 1.4TB sas + #'db1001'=> 100, # 1.4TB sas 'db1042'=> 400, # 1.4TB sas 'db1043'=> 50, # 1.4TB sas, special contrib, watchlist, etc 64GB 'db1049'=> 50, # 2.8TB sas 64GB future watchlist -- To view, visit https://gerrit.wikimedia.org/r/57169 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0d06c187a6a86284dd8e0a8459b3fa4a8e9640b6 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sync X-Device rules with MobileFrontend - change (operations/puppet)
Asher has submitted this change and it was merged.
Change subject: Sync X-Device rules with MobileFrontend
..
Sync X-Device rules with MobileFrontend
Due to the nature of these changes, this revision can be deployed
before the corresponding MobileFrontend changes.
Change-Id: Icd800c94e178cdc39ea985bafa8f6df1933ef06a
---
M templates/varnish/mobile-frontend.inc.vcl.erb
1 file changed, 2 insertions(+), 12 deletions(-)
Approvals:
Asher: Verified; Looks good to me, approved
Faidon: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb
b/templates/varnish/mobile-frontend.inc.vcl.erb
index 5fd21ce..059010c 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -483,22 +483,12 @@
set req.http.X-Device = "operamobile";
} else if( req.http.User-Agent ~ "Safari" && ( req.http.User-Agent ~
"iPad" ||
req.http.User-Agent ~ "iPhone" ) ) {
- if( req.http.User-Agent ~ "iPad" ) {
- set req.http.X-Device = "iphone";
- } else if ( req.http.User-Agent ~ "iPhone" ) {
- if( req.http.User-Agent ~ "iPhone OS 2" ) {
- set req.http.X-Device = "iphone2";
- } else {
- set req.http.X-Device = "iphone";
- }
- } else {
- set req.http.X-Device = "webkit";
- }
+ set req.http.X-Device = "iphone";
} else if( req.http.User-Agent ~ "iPhone" ) {
if( req.http.User-Agent ~ "Opera" ) {
set req.http.X-Device = "operamini";
} else {
- set req.http.X-Device = "native_iphone";
+ set req.http.X-Device = "capable";
}
} else if( req.http.User-Agent ~ "WebKit" ) {
if( req.http.User-Agent ~ "Series60" ) {
--
To view, visit https://gerrit.wikimedia.org/r/56502
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icd800c94e178cdc39ea985bafa8f6df1933ef06a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: MaxSem
Gerrit-Reviewer: Asher
Gerrit-Reviewer: Faidon
Gerrit-Reviewer: Mark Bergsma
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update X-CS handling to new k/v pair spec - change (operations/puppet)
Asher has submitted this change and it was merged.
Change subject: Update X-CS handling to new k/v pair spec
..
Update X-CS handling to new k/v pair spec
Per discussion between ops, mobile, and analytics, the X-CS HTTP
header is being repurposed as a general analytics header. Specific
data needed by analytics is serialized into key/value pairs that
are appended to the X-CS header, separated by ';'.
Also updates ncsa file to use X-Analytics rather than X-CS
Note that original X-CS handling is retained here, until we are certain
all upstream users of X-CS are updated, and that there are no other
issues with X-Analytics.
This is related to Change-Id: I93758fc76721d89f9c32a28c1821f3e59eb384ef
Change-Id: I14973cce2d2e80f480aabefa2dfbbfd5936db6cb
---
M files/varnish/varnishncsa.default
M templates/varnish/mobile-frontend.inc.vcl.erb
2 files changed, 22 insertions(+), 3 deletions(-)
Approvals:
Asher: Verified; Looks good to me, approved
awjrichards: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/files/varnish/varnishncsa.default
b/files/varnish/varnishncsa.default
index 50fcd34..fbdf1ca 100644
--- a/files/varnish/varnishncsa.default
+++ b/files/varnish/varnishncsa.default
@@ -6,4 +6,4 @@
# the Wikimedia default log format, except
# for the addition of the Content-Type
# response header. See RT 2255.
-LOG_FORMAT="%l %n %t %{Varnish:time_firstbyte}x %h
%{Varnish:handling}x/%s %b %m http://%{Host}i%U%q -
%{Content-Type}o%{Referer}i %{X-Forwarded-For}i %{User-agent}i
%{Accept-Language}i %{X-CS}o"
+LOG_FORMAT="%l %n %t %{Varnish:time_firstbyte}x %h
%{Varnish:handling}x/%s %b %m http://%{Host}i%U%q -
%{Content-Type}o%{Referer}i %{X-Forwarded-For}i %{User-agent}i
%{Accept-Language}i %{X-Analytics}o"
diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb
b/templates/varnish/mobile-frontend.inc.vcl.erb
index 329c1e6..8e65756 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -497,7 +497,7 @@
char *last;
char *xff_ip = strtok(VRT_GetHdr(sp, HDR_REQ,
"\020X-Forwarded-For:"), ",");
-
+
if (xff_ip == NULL) {
xff_ip = VRT_GetHdr(sp, HDR_REQ,
"\020X-Forwarded-For:");
}
@@ -513,6 +513,19 @@
}
call tag_carrier;
+
+ /* Assemble X-Analytics header */
+ if (req.http.X-CS) {
+ set req.http.X-Analytics = "zero=" + req.http.X-CS;
+ }
+
+ /*
+ TODO: X-CS is retained here (as the antecedent to X-Analytics),
+ but should be removed as soon as X-Analytics is confirmed working
+ and all upstream users of X-CS are modified to use the X-Analytics
+ header instead.
+ */
+
/* Replace .m..org by ..org */
if ( req.http.host ~ "^([a-zA-Z0-9-]+)\.m\.([a-zA-Z0-9-]+)\.org" ) {
set req.http.host = regsub( req.http.host,
"^([a-zA-Z0-9-]+)\.m\.([a-zA-Z0-9-]+)\.org", "\1.\2.org");
@@ -604,7 +617,7 @@
}
}
- if ( req.url == "/" ) {
+ if ( req.url == "/" ) {
set req.url = "/?useformat=mobile";
}
@@ -624,7 +637,13 @@
set beresp.http.X-Device = req.http.X-Device;
set beresp.http.X-Carrier = req.http.X-Carrier;
+ /* TODO: remove X-CS header */
set beresp.http.X-CS = req.http.X-CS;
+ if ( beresp.http.X-Analytics ) {
+ # Do nothing, X-Analytics has already been handled
+ } else if ( req.http.X-Analytics ) {
+ set beresp.http.X-Analytics = req.http.X-Analytics;
+ }
if (req.url ~ "mobileaction=" || req.url ~ "useformat=") {
set beresp.ttl = 60 s;
}
--
To view, visit https://gerrit.wikimedia.org/r/52606
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I14973cce2d2e80f480aabefa2dfbbfd5936db6cb
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: awjrichards
Gerrit-Reviewer: Asher
Gerrit-Reviewer: Diederik
Gerrit-Reviewer: Dsc
Gerrit-Reviewer: Mark Bergsma
Gerrit-Reviewer: Ottomata
Gerrit-Reviewer: Yurik
Gerrit-Reviewer: awjrichards
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] - fix issue where export wouldn't work under high load, lead... - change (operations/software)
Asher has submitted this change and it was merged.
Change subject: - fix issue where export wouldn't work under high load, leading
to graphs flipping between no data and huge spikes when a response was received
minutes later
..
- fix issue where export wouldn't work under high load, leading to graphs
flipping between no data and huge spikes when a response was received minutes
later
Change-Id: I2bc117d5620b9e545a8e5a6cf3b654ee835b75d7
---
M udpprofile/collector.c
1 file changed, 9 insertions(+), 3 deletions(-)
Approvals:
Asher: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/udpprofile/collector.c b/udpprofile/collector.c
index 2154d58..077bcbf 100644
--- a/udpprofile/collector.c
+++ b/udpprofile/collector.c
@@ -4,7 +4,8 @@
and places them into BerkeleyDB file. \o/
Author: Domas Mituzas ( http://dammit.lt/ )
-
+ Author: Asher Feldman ( afeld...@wikimedia.org )
+ Author: Tim Starling ( tstarl...@wikimedia.org )
License: public domain (as if there's something to protect ;-)
$Id: collector.c 112227 2012-02-23 19:15:17Z midom $
@@ -38,7 +39,7 @@
ssize_t l;
char buf[2000];
int r;
-
+ int n;
/* Socket variables */
int s, exp;
@@ -72,7 +73,7 @@
fds[1].fd = exp, fds[1].events |= POLLIN;
db_create(&db,NULL,0);
- db->set_cachesize(db, 0, 256*1024*1024, 0);
+ db->set_cachesize(db, 0, 512*1024*1024, 0);
db->open(db,NULL,"stats.db",NULL,DB_BTREE,DB_CREATE|DB_TRUNCATE,0);
signal(SIGHUP,hup);
@@ -84,6 +85,7 @@
}
/* Loop! loop! loop! */
for(;;) {
+ n=0;
r=poll(fds,2,-1);
/* Process incoming UDP queue */
@@ -92,6 +94,10 @@
if (l==EAGAIN)
break;
handleMessage((char *)&buf,l);
+ n++;
+ /* Still handle export connections under high
load */
+ if (n==5000)
+ break;
}
/* Process incoming TCP queue */
--
To view, visit https://gerrit.wikimedia.org/r/56428
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2bc117d5620b9e545a8e5a6cf3b654ee835b75d7
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Asher
Gerrit-Reviewer: Asher
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] - fix issue where export wouldn't work under high load, lead... - change (operations/software)
Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56428
Change subject: - fix issue where export wouldn't work under high load, leading
to graphs flipping between no data and huge spikes when a response was received
minutes later
..
- fix issue where export wouldn't work under high load, leading to graphs
flipping between no data and huge spikes when a response was received minutes
later
Change-Id: I2bc117d5620b9e545a8e5a6cf3b654ee835b75d7
---
M udpprofile/collector.c
1 file changed, 9 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/software
refs/changes/28/56428/1
diff --git a/udpprofile/collector.c b/udpprofile/collector.c
index 2154d58..077bcbf 100644
--- a/udpprofile/collector.c
+++ b/udpprofile/collector.c
@@ -4,7 +4,8 @@
and places them into BerkeleyDB file. \o/
Author: Domas Mituzas ( http://dammit.lt/ )
-
+ Author: Asher Feldman ( afeld...@wikimedia.org )
+ Author: Tim Starling ( tstarl...@wikimedia.org )
License: public domain (as if there's something to protect ;-)
$Id: collector.c 112227 2012-02-23 19:15:17Z midom $
@@ -38,7 +39,7 @@
ssize_t l;
char buf[2000];
int r;
-
+ int n;
/* Socket variables */
int s, exp;
@@ -72,7 +73,7 @@
fds[1].fd = exp, fds[1].events |= POLLIN;
db_create(&db,NULL,0);
- db->set_cachesize(db, 0, 256*1024*1024, 0);
+ db->set_cachesize(db, 0, 512*1024*1024, 0);
db->open(db,NULL,"stats.db",NULL,DB_BTREE,DB_CREATE|DB_TRUNCATE,0);
signal(SIGHUP,hup);
@@ -84,6 +85,7 @@
}
/* Loop! loop! loop! */
for(;;) {
+ n=0;
r=poll(fds,2,-1);
/* Process incoming UDP queue */
@@ -92,6 +94,10 @@
if (l==EAGAIN)
break;
handleMessage((char *)&buf,l);
+ n++;
+ /* Still handle export connections under high
load */
+ if (n==5000)
+ break;
}
/* Process incoming TCP queue */
--
To view, visit https://gerrit.wikimedia.org/r/56428
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2bc117d5620b9e545a8e5a6cf3b654ee835b75d7
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] changing s1 slave weights for testing - change (operations/mediawiki-config)
Asher has submitted this change and it was merged. Change subject: changing s1 slave weights for testing .. changing s1 slave weights for testing Change-Id: Idcf6e669075be3d2bcb4dbcb55f66bb3bff910e2 --- M wmf-config/db-eqiad.php 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Asher: Verified; Looks good to me, approved diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index c3fc6e4..adb4ef8 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -82,10 +82,10 @@ 's1' => array( 'db1017'=> 0, # 1.4TB #'db1001'=> 400, # 1.4TB sas - 'db1042'=> 100, # 1.4TB sas - 'db1043'=> 100, # 1.4TB sas, special contrib, watchlist, etc 64GB - 'db1049'=> 100, # 2.8TB sas 64GB future watchlist - 'db1050'=> 100, # snapshot 2.8TB sas 64GB + 'db1042'=> 400, # 1.4TB sas + 'db1043'=> 50, # 1.4TB sas, special contrib, watchlist, etc 64GB + 'db1049'=> 50, # 2.8TB sas 64GB future watchlist + 'db1050'=> 50, # snapshot 2.8TB sas 64GB 'db1051'=> 400, # 2.8TB sas 96GB 'db1052'=> 400, # 2.8TB sas 96GB #'db1056'=> 400, # 2.8TB sas 96GB future master -- To view, visit https://gerrit.wikimedia.org/r/56313 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idcf6e669075be3d2bcb4dbcb55f66bb3bff910e2 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher Gerrit-Reviewer: Asher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] changing s1 slave weights for testing - change (operations/mediawiki-config)
Asher has uploaded a new change for review. https://gerrit.wikimedia.org/r/56313 Change subject: changing s1 slave weights for testing .. changing s1 slave weights for testing Change-Id: Idcf6e669075be3d2bcb4dbcb55f66bb3bff910e2 --- 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/13/56313/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index c3fc6e4..adb4ef8 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -82,10 +82,10 @@ 's1' => array( 'db1017'=> 0, # 1.4TB #'db1001'=> 400, # 1.4TB sas - 'db1042'=> 100, # 1.4TB sas - 'db1043'=> 100, # 1.4TB sas, special contrib, watchlist, etc 64GB - 'db1049'=> 100, # 2.8TB sas 64GB future watchlist - 'db1050'=> 100, # snapshot 2.8TB sas 64GB + 'db1042'=> 400, # 1.4TB sas + 'db1043'=> 50, # 1.4TB sas, special contrib, watchlist, etc 64GB + 'db1049'=> 50, # 2.8TB sas 64GB future watchlist + 'db1050'=> 50, # snapshot 2.8TB sas 64GB 'db1051'=> 400, # 2.8TB sas 96GB 'db1052'=> 400, # 2.8TB sas 96GB #'db1056'=> 400, # 2.8TB sas 96GB future master -- To view, visit https://gerrit.wikimedia.org/r/56313 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idcf6e669075be3d2bcb4dbcb55f66bb3bff910e2 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pulling db1001, adding db1052 - change (operations/mediawiki-config)
Asher has submitted this change and it was merged. Change subject: pulling db1001, adding db1052 .. pulling db1001, adding db1052 Change-Id: Ifc6fd4832775cff65bf897a47637b77cea7c224d --- M wmf-config/db-eqiad.php 1 file changed, 7 insertions(+), 5 deletions(-) Approvals: Asher: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index abe83a2..c3fc6e4 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -81,13 +81,14 @@ 'sectionLoads' => array( 's1' => array( 'db1017'=> 0, # 1.4TB - 'db1001'=> 400, # 1.4TB sas - 'db1042'=> 400, # 1.4TB sas - 'db1049'=> 300, # 2.8TB sas 64GB future watchlist? + #'db1001'=> 400, # 1.4TB sas + 'db1042'=> 100, # 1.4TB sas + 'db1043'=> 100, # 1.4TB sas, special contrib, watchlist, etc 64GB + 'db1049'=> 100, # 2.8TB sas 64GB future watchlist 'db1050'=> 100, # snapshot 2.8TB sas 64GB 'db1051'=> 400, # 2.8TB sas 96GB - #'db1052'=> 400, # 2.8TB sas 96GB - 'db1043'=> 100, # 1.4TB sas, special contrib, watchlist, etc 64GB + 'db1052'=> 400, # 2.8TB sas 96GB + #'db1056'=> 400, # 2.8TB sas 96GB future master ), 's2' => array( 'db1034'=> 0, @@ -236,6 +237,7 @@ 'db1050' => '10.64.16.145', #do not remove or comment out 'db1051' => '10.64.32.21', #do not remove or comment out 'db1052' => '10.64.32.22', #do not remove or comment out + 'db1056' => '10.64.32.26', #do not remove or comment out ), 'externalLoads' => array( -- To view, visit https://gerrit.wikimedia.org/r/56081 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifc6fd4832775cff65bf897a47637b77cea7c224d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher Gerrit-Reviewer: Asher Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pulling db1001, adding db1052 - change (operations/mediawiki-config)
Asher has uploaded a new change for review. https://gerrit.wikimedia.org/r/56081 Change subject: pulling db1001, adding db1052 .. pulling db1001, adding db1052 Change-Id: Ifc6fd4832775cff65bf897a47637b77cea7c224d --- M wmf-config/db-eqiad.php 1 file changed, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/81/56081/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index abe83a2..c3fc6e4 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -81,13 +81,14 @@ 'sectionLoads' => array( 's1' => array( 'db1017'=> 0, # 1.4TB - 'db1001'=> 400, # 1.4TB sas - 'db1042'=> 400, # 1.4TB sas - 'db1049'=> 300, # 2.8TB sas 64GB future watchlist? + #'db1001'=> 400, # 1.4TB sas + 'db1042'=> 100, # 1.4TB sas + 'db1043'=> 100, # 1.4TB sas, special contrib, watchlist, etc 64GB + 'db1049'=> 100, # 2.8TB sas 64GB future watchlist 'db1050'=> 100, # snapshot 2.8TB sas 64GB 'db1051'=> 400, # 2.8TB sas 96GB - #'db1052'=> 400, # 2.8TB sas 96GB - 'db1043'=> 100, # 1.4TB sas, special contrib, watchlist, etc 64GB + 'db1052'=> 400, # 2.8TB sas 96GB + #'db1056'=> 400, # 2.8TB sas 96GB future master ), 's2' => array( 'db1034'=> 0, @@ -236,6 +237,7 @@ 'db1050' => '10.64.16.145', #do not remove or comment out 'db1051' => '10.64.32.21', #do not remove or comment out 'db1052' => '10.64.32.22', #do not remove or comment out + 'db1056' => '10.64.32.26', #do not remove or comment out ), 'externalLoads' => array( -- To view, visit https://gerrit.wikimedia.org/r/56081 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifc6fd4832775cff65bf897a47637b77cea7c224d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] adding new s1 dbs - change (operations/puppet)
Asher has submitted this change and it was merged.
Change subject: adding new s1 dbs
..
adding new s1 dbs
Change-Id: Ib268ac5c820991aa95706f8c054a3b1a08676723
---
M manifests/role/coredb.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Asher: Verified; Looks good to me, approved
diff --git a/manifests/role/coredb.pp b/manifests/role/coredb.pp
index c73bade..1365f0f 100644
--- a/manifests/role/coredb.pp
+++ b/manifests/role/coredb.pp
@@ -10,7 +10,7 @@
$topology = {
's1' => {
'hosts' => { 'pmtpa' => [ 'db32', 'db59', 'db60',
'db63', 'db67', 'db69', 'db71' ],
- 'eqiad' => [ 'db1001', 'db1017', 'db1042',
'db1043', 'db1047', 'db1049', 'db1050'] },
+ 'eqiad' => [ 'db1001', 'db1017', 'db1042',
'db1043', 'db1047', 'db1049', 'db1050', 'db1051', 'db1052', 'db1056' ] },
'primary_site' => $::mw_primary,
'masters' => { 'pmtpa' => "db63", 'eqiad' => "db1017" },
'snapshot' => [ "db32", "db1050" ],
--
To view, visit https://gerrit.wikimedia.org/r/55945
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib268ac5c820991aa95706f8c054a3b1a08676723
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
Gerrit-Reviewer: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] adding new s1 dbs - change (operations/puppet)
Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55945
Change subject: adding new s1 dbs
..
adding new s1 dbs
Change-Id: Ib268ac5c820991aa95706f8c054a3b1a08676723
---
M manifests/role/coredb.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/45/55945/1
diff --git a/manifests/role/coredb.pp b/manifests/role/coredb.pp
index c73bade..1365f0f 100644
--- a/manifests/role/coredb.pp
+++ b/manifests/role/coredb.pp
@@ -10,7 +10,7 @@
$topology = {
's1' => {
'hosts' => { 'pmtpa' => [ 'db32', 'db59', 'db60',
'db63', 'db67', 'db69', 'db71' ],
- 'eqiad' => [ 'db1001', 'db1017', 'db1042',
'db1043', 'db1047', 'db1049', 'db1050'] },
+ 'eqiad' => [ 'db1001', 'db1017', 'db1042',
'db1043', 'db1047', 'db1049', 'db1050', 'db1051', 'db1052', 'db1056' ] },
'primary_site' => $::mw_primary,
'masters' => { 'pmtpa' => "db63", 'eqiad' => "db1017" },
'snapshot' => [ "db32", "db1050" ],
--
To view, visit https://gerrit.wikimedia.org/r/55945
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib268ac5c820991aa95706f8c054a3b1a08676723
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] found another mariadb performance regression with extended_keys - change (operations/puppet)
Asher has submitted this change and it was merged.
Change subject: found another mariadb performance regression with extended_keys
..
found another mariadb performance regression with extended_keys
Change-Id: I6509960d77915d309c03aac75b56804e15f1fa39
---
M modules/coredb_mysql/templates/prod.my.cnf.erb
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Asher: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/coredb_mysql/templates/prod.my.cnf.erb
b/modules/coredb_mysql/templates/prod.my.cnf.erb
index 72dd962..50146aa 100644
--- a/modules/coredb_mysql/templates/prod.my.cnf.erb
+++ b/modules/coredb_mysql/templates/prod.my.cnf.erb
@@ -65,7 +65,9 @@
<% if has_variable?("mariadb") and mariadb == true then -%>
query_cache_type=0
log_slow_verbosity=Query_plan
-optimizer_switch='mrr=on,mrr_cost_based=on,mrr_sort_keys=on,optimize_join_buffer_size=on,extended_keys=on'
+optimizer_switch='mrr=on,mrr_cost_based=on,mrr_sort_keys=on,optimize_join_buffer_size=on,extended_keys=off'
+#thread_handling=pool-of-threads
+#extra_port=3308
<% else %>
rpl_transaction_enabled
reserved_super_connections=20
--
To view, visit https://gerrit.wikimedia.org/r/55834
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6509960d77915d309c03aac75b56804e15f1fa39
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
Gerrit-Reviewer: Asher
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] found another mariadb performance regression with extended_keys - change (operations/puppet)
Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55834
Change subject: found another mariadb performance regression with extended_keys
..
found another mariadb performance regression with extended_keys
Change-Id: I6509960d77915d309c03aac75b56804e15f1fa39
---
M modules/coredb_mysql/templates/prod.my.cnf.erb
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/34/55834/1
diff --git a/modules/coredb_mysql/templates/prod.my.cnf.erb
b/modules/coredb_mysql/templates/prod.my.cnf.erb
index 72dd962..50146aa 100644
--- a/modules/coredb_mysql/templates/prod.my.cnf.erb
+++ b/modules/coredb_mysql/templates/prod.my.cnf.erb
@@ -65,7 +65,9 @@
<% if has_variable?("mariadb") and mariadb == true then -%>
query_cache_type=0
log_slow_verbosity=Query_plan
-optimizer_switch='mrr=on,mrr_cost_based=on,mrr_sort_keys=on,optimize_join_buffer_size=on,extended_keys=on'
+optimizer_switch='mrr=on,mrr_cost_based=on,mrr_sort_keys=on,optimize_join_buffer_size=on,extended_keys=off'
+#thread_handling=pool-of-threads
+#extra_port=3308
<% else %>
rpl_transaction_enabled
reserved_super_connections=20
--
To view, visit https://gerrit.wikimedia.org/r/55834
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6509960d77915d309c03aac75b56804e15f1fa39
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] adding db1051 - change (operations/mediawiki-config)
Asher has submitted this change and it was merged. Change subject: adding db1051 .. adding db1051 Change-Id: I8beee1e2faa6a86a353d1b83a677c6e47ba85e98 --- M wmf-config/db-eqiad.php 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Asher: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index d6bd580..abe83a2 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -83,9 +83,9 @@ 'db1017'=> 0, # 1.4TB 'db1001'=> 400, # 1.4TB sas 'db1042'=> 400, # 1.4TB sas - 'db1049'=> 400, # 2.8TB sas 64GB + 'db1049'=> 300, # 2.8TB sas 64GB future watchlist? 'db1050'=> 100, # snapshot 2.8TB sas 64GB - #'db1051'=> 400, # 2.8TB sas 96GB + 'db1051'=> 400, # 2.8TB sas 96GB #'db1052'=> 400, # 2.8TB sas 96GB 'db1043'=> 100, # 1.4TB sas, special contrib, watchlist, etc 64GB ), @@ -234,7 +234,8 @@ 'db1047' => '10.64.16.36', #do not remove or comment out 'db1049' => '10.64.16.144', #do not remove or comment out 'db1050' => '10.64.16.145', #do not remove or comment out - 'pc1' => '10.0.0.221', # do not remove or comment out # Parser Cache + 'db1051' => '10.64.32.21', #do not remove or comment out + 'db1052' => '10.64.32.22', #do not remove or comment out ), 'externalLoads' => array( -- To view, visit https://gerrit.wikimedia.org/r/55831 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8beee1e2faa6a86a353d1b83a677c6e47ba85e98 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher Gerrit-Reviewer: Asher Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] adding db1051 - change (operations/mediawiki-config)
Asher has uploaded a new change for review. https://gerrit.wikimedia.org/r/55831 Change subject: adding db1051 .. adding db1051 Change-Id: I8beee1e2faa6a86a353d1b83a677c6e47ba85e98 --- 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/31/55831/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index d6bd580..4f0155a 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -83,9 +83,9 @@ 'db1017'=> 0, # 1.4TB 'db1001'=> 400, # 1.4TB sas 'db1042'=> 400, # 1.4TB sas - 'db1049'=> 400, # 2.8TB sas 64GB + 'db1049'=> 300, # 2.8TB sas 64GB future watchlist? 'db1050'=> 100, # snapshot 2.8TB sas 64GB - #'db1051'=> 400, # 2.8TB sas 96GB + 'db1051'=> 400, # 2.8TB sas 96GB #'db1052'=> 400, # 2.8TB sas 96GB 'db1043'=> 100, # 1.4TB sas, special contrib, watchlist, etc 64GB ), -- To view, visit https://gerrit.wikimedia.org/r/55831 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8beee1e2faa6a86a353d1b83a677c6e47ba85e98 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] changing s1 weights - change (operations/mediawiki-config)
Asher has submitted this change and it was merged. Change subject: changing s1 weights .. changing s1 weights Change-Id: Id01cbb335586852c2a543eafd7ca9975503e9f8c --- M wmf-config/db-eqiad.php 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: Asher: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 574bff4..d6bd580 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -83,9 +83,11 @@ 'db1017'=> 0, # 1.4TB 'db1001'=> 400, # 1.4TB sas 'db1042'=> 400, # 1.4TB sas - 'db1049'=> 500, # 2.8TB sas - #'db1050'=> 0, # snapshot 2.8TB sas - 'db1043'=> 100, # 1.4TB sas, special contrib, watchlist, etc + 'db1049'=> 400, # 2.8TB sas 64GB + 'db1050'=> 100, # snapshot 2.8TB sas 64GB + #'db1051'=> 400, # 2.8TB sas 96GB + #'db1052'=> 400, # 2.8TB sas 96GB + 'db1043'=> 100, # 1.4TB sas, special contrib, watchlist, etc 64GB ), 's2' => array( 'db1034'=> 0, -- To view, visit https://gerrit.wikimedia.org/r/55824 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id01cbb335586852c2a543eafd7ca9975503e9f8c Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher Gerrit-Reviewer: Asher Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] changing s1 weights - change (operations/mediawiki-config)
Asher has uploaded a new change for review. https://gerrit.wikimedia.org/r/55824 Change subject: changing s1 weights .. changing s1 weights Change-Id: Id01cbb335586852c2a543eafd7ca9975503e9f8c --- M wmf-config/db-eqiad.php 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/24/55824/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 574bff4..2cac26b 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -83,9 +83,11 @@ 'db1017'=> 0, # 1.4TB 'db1001'=> 400, # 1.4TB sas 'db1042'=> 400, # 1.4TB sas - 'db1049'=> 500, # 2.8TB sas - #'db1050'=> 0, # snapshot 2.8TB sas - 'db1043'=> 100, # 1.4TB sas, special contrib, watchlist, etc + 'db1049'=> 400, # 2.8TB sas 64GB + 'db1050'=> 100, # snapshot 2.8TB sas 64GB + #'db1051'=> 400, # 2.8TB sas 96GB + #'db1052'=> 400, # 2.8TB sas 96GB + 'db1043'=> 10, # 1.4TB sas, special contrib, watchlist, etc 64GB ), 's2' => array( 'db1034'=> 0, -- To view, visit https://gerrit.wikimedia.org/r/55824 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id01cbb335586852c2a543eafd7ca9975503e9f8c Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Relax checks for translation memory Solr - change (operations/puppet)
Asher has submitted this change and it was merged.
Change subject: Relax checks for translation memory Solr
..
Relax checks for translation memory Solr
Change-Id: I39d610cb24b2ebbdcfe0d361786a341115f10cc4
---
M manifests/role/solr.pp
1 file changed, 8 insertions(+), 5 deletions(-)
Approvals:
Nikerabbit: Looks good to me, but someone else must approve
Asher: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/solr.pp b/manifests/role/solr.pp
index 3c04e49..07b5f1f 100644
--- a/manifests/role/solr.pp
+++ b/manifests/role/solr.pp
@@ -4,9 +4,11 @@
#
# == Parameters:
#
-# $schema:: Schema file for Solr (only one schema per instance
supported)
-# $replication_master:: Replication master, if this is current hostname, this
server will be a master
-class role::solr($schema = undef, $replication_master = undef ) {
+# $schema:: Schema file for Solr (only one schema per instance
supported)
+# $replication_master:: Replication master, if this is current hostname,
this server will be a master
+# $average_request_time:: Average request time check threshold, the format is
+# "warning threshold:error threshold", or simply
"error threshold"
+class role::solr($schema = undef, $replication_master = undef,
$average_request_time = "400:600" ) {
class { "::solr":
schema => $schema,
replication_master => $replication_master,
@@ -18,7 +20,7 @@
}
monitor_service { "Solr":
description => "Solr",
- check_command => "$check_command!400:600!5",
+ check_command => "$check_command!$average_request_time!5",
}
}
@@ -26,7 +28,8 @@
system_role { "solr": description => "ttm solr backend" }
class { "role::solr":
- schema => "puppet:///modules/solr/schema-ttmserver.xml"
+ schema => "puppet:///modules/solr/schema-ttmserver.xml",
+ average_request_time => '1000:1500', # Translate uses fairly
slow queries
}
}
--
To view, visit https://gerrit.wikimedia.org/r/55036
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I39d610cb24b2ebbdcfe0d361786a341115f10cc4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: MaxSem
Gerrit-Reviewer: Asher
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: Pyoungmeister
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] building db1056 for s1 (will be removing all hosts with 300G... - change (operations/puppet)
Asher has submitted this change and it was merged.
Change subject: building db1056 for s1 (will be removing all hosts with 300GB
drives from s1)
..
building db1056 for s1 (will be removing all hosts with 300GB drives from s1)
Change-Id: Ie624dd274ece3c4426d556436053377db0f7ba50
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Asher: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index c019eb5..bf7e9b6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -479,13 +479,13 @@
}
# eqiad dbs
-node /^db10(01|17|42|43|49|50|51|52)\.eqiad\.wmnet/ {
+node /^db10(01|17|42|43|49|50|51|52|56)\.eqiad\.wmnet/ {
if $hostname =~ /^db10(01|17)/ {
$ganglia_aggregator = "true"
include mha::manager
}
- if $hostname =~ /^db10(51|52)/ {
+ if $hostname =~ /^db10(51|52|56)/ {
class { role::coredb::s1 : innodb_file_per_table => true,
mariadb => true }
} elsif $hostname =~ /^db10(43|49)/ {
class { role::coredb::s1 : mariadb => true }
--
To view, visit https://gerrit.wikimedia.org/r/55821
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie624dd274ece3c4426d556436053377db0f7ba50
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
Gerrit-Reviewer: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] building db1056 for s1 (will be removing all hosts with 300G... - change (operations/puppet)
Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55821
Change subject: building db1056 for s1 (will be removing all hosts with 300GB
drives from s1)
..
building db1056 for s1 (will be removing all hosts with 300GB drives from s1)
Change-Id: Ie624dd274ece3c4426d556436053377db0f7ba50
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/21/55821/1
diff --git a/manifests/site.pp b/manifests/site.pp
index c019eb5..bf7e9b6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -479,13 +479,13 @@
}
# eqiad dbs
-node /^db10(01|17|42|43|49|50|51|52)\.eqiad\.wmnet/ {
+node /^db10(01|17|42|43|49|50|51|52|56)\.eqiad\.wmnet/ {
if $hostname =~ /^db10(01|17)/ {
$ganglia_aggregator = "true"
include mha::manager
}
- if $hostname =~ /^db10(51|52)/ {
+ if $hostname =~ /^db10(51|52|56)/ {
class { role::coredb::s1 : innodb_file_per_table => true,
mariadb => true }
} elsif $hostname =~ /^db10(43|49)/ {
class { role::coredb::s1 : mariadb => true }
--
To view, visit https://gerrit.wikimedia.org/r/55821
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie624dd274ece3c4426d556436053377db0f7ba50
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] db67 -> mariadb - change (operations/puppet)
Asher has submitted this change and it was merged.
Change subject: db67 -> mariadb
..
db67 -> mariadb
Change-Id: I178727d6146ddb1ca06cb6a180f128f903f98120
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Asher: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 9d8ad90..c019eb5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -450,7 +450,7 @@
## researchdb
node /^db67\.pmtpa\.wmnet/ {
- include role::coredb::researchdb
+ class { role::coredb::researchdb : mariadb => true }
}
## pgehres special project
--
To view, visit https://gerrit.wikimedia.org/r/55625
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I178727d6146ddb1ca06cb6a180f128f903f98120
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
Gerrit-Reviewer: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] db67 -> mariadb - change (operations/puppet)
Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55625
Change subject: db67 -> mariadb
..
db67 -> mariadb
Change-Id: I178727d6146ddb1ca06cb6a180f128f903f98120
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/25/55625/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 9d8ad90..c019eb5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -450,7 +450,7 @@
## researchdb
node /^db67\.pmtpa\.wmnet/ {
- include role::coredb::researchdb
+ class { role::coredb::researchdb : mariadb => true }
}
## pgehres special project
--
To view, visit https://gerrit.wikimedia.org/r/55625
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I178727d6146ddb1ca06cb6a180f128f903f98120
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] db1050 died - change (operations/mediawiki-config)
Asher has submitted this change and it was merged. Change subject: db1050 died .. db1050 died Change-Id: Iaf3d32e6867ee22da1f3adaaacca46cdab733d71 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Asher: Verified; Looks good to me, approved diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index bee7b66..574bff4 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -84,7 +84,7 @@ 'db1001'=> 400, # 1.4TB sas 'db1042'=> 400, # 1.4TB sas 'db1049'=> 500, # 2.8TB sas - 'db1050'=> 0, # snapshot 2.8TB sas + #'db1050'=> 0, # snapshot 2.8TB sas 'db1043'=> 100, # 1.4TB sas, special contrib, watchlist, etc ), 's2' => array( -- To view, visit https://gerrit.wikimedia.org/r/55241 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaf3d32e6867ee22da1f3adaaacca46cdab733d71 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher Gerrit-Reviewer: Asher Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] db1050 died - change (operations/mediawiki-config)
Asher has uploaded a new change for review. https://gerrit.wikimedia.org/r/55241 Change subject: db1050 died .. db1050 died Change-Id: Iaf3d32e6867ee22da1f3adaaacca46cdab733d71 --- 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/41/55241/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index bee7b66..574bff4 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -84,7 +84,7 @@ 'db1001'=> 400, # 1.4TB sas 'db1042'=> 400, # 1.4TB sas 'db1049'=> 500, # 2.8TB sas - 'db1050'=> 0, # snapshot 2.8TB sas + #'db1050'=> 0, # snapshot 2.8TB sas 'db1043'=> 100, # 1.4TB sas, special contrib, watchlist, etc ), 's2' => array( -- To view, visit https://gerrit.wikimedia.org/r/55241 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf3d32e6867ee22da1f3adaaacca46cdab733d71 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] return es100[69], pmtpa s2 dbs - change (operations/mediawiki-config)
Asher has submitted this change and it was merged. Change subject: return es100[69], pmtpa s2 dbs .. return es100[69], pmtpa s2 dbs Change-Id: If96027077e3b0a86caf38706b7e6cabaf07485a1 --- M wmf-config/db-eqiad.php M wmf-config/db-pmtpa.php 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Asher: Verified; Looks good to me, approved diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index a8ef6f3..bee7b66 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -262,13 +262,13 @@ # es2 'cluster24' => array( '10.64.16.153' => 1, # es1005 - #'10.64.16.154' => 3, # es1006 + '10.64.16.154' => 3, # es1006 '10.64.32.17' => 1, # es1007 snapshot host ), # es3 'cluster25' => array( '10.64.32.18' => 1, # es1008 - #'10.64.32.19' => 3, # es1009 + '10.64.32.19' => 3, # es1009 '10.64.32.20' => 1, # es1010 snapshot host ), # ExtensionStore shard1 - initially for AFTv5 diff --git a/wmf-config/db-pmtpa.php b/wmf-config/db-pmtpa.php index ef1b99f..372b2fc 100644 --- a/wmf-config/db-pmtpa.php +++ b/wmf-config/db-pmtpa.php @@ -93,8 +93,8 @@ 'db1034'=> 0, 'db54'=> 0, # pmtpa master 'db52'=> 300, - #'db53' => 100, # snapshot host - #'db57' => 300, # innodb_file_per_table + 'db53'=> 100, # snapshot host + 'db57'=> 300, # innodb_file_per_table ), /* s3 */ 'DEFAULT' => array( 'db1019'=> 0, -- To view, visit https://gerrit.wikimedia.org/r/55001 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If96027077e3b0a86caf38706b7e6cabaf07485a1 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher Gerrit-Reviewer: Asher Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] return es100[69], pmtpa s2 dbs - change (operations/mediawiki-config)
Asher has uploaded a new change for review. https://gerrit.wikimedia.org/r/55001 Change subject: return es100[69], pmtpa s2 dbs .. return es100[69], pmtpa s2 dbs Change-Id: If96027077e3b0a86caf38706b7e6cabaf07485a1 --- M wmf-config/db-eqiad.php M wmf-config/db-pmtpa.php 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/01/55001/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index a8ef6f3..bee7b66 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -262,13 +262,13 @@ # es2 'cluster24' => array( '10.64.16.153' => 1, # es1005 - #'10.64.16.154' => 3, # es1006 + '10.64.16.154' => 3, # es1006 '10.64.32.17' => 1, # es1007 snapshot host ), # es3 'cluster25' => array( '10.64.32.18' => 1, # es1008 - #'10.64.32.19' => 3, # es1009 + '10.64.32.19' => 3, # es1009 '10.64.32.20' => 1, # es1010 snapshot host ), # ExtensionStore shard1 - initially for AFTv5 diff --git a/wmf-config/db-pmtpa.php b/wmf-config/db-pmtpa.php index ef1b99f..372b2fc 100644 --- a/wmf-config/db-pmtpa.php +++ b/wmf-config/db-pmtpa.php @@ -93,8 +93,8 @@ 'db1034'=> 0, 'db54'=> 0, # pmtpa master 'db52'=> 300, - #'db53' => 100, # snapshot host - #'db57' => 300, # innodb_file_per_table + 'db53'=> 100, # snapshot host + 'db57'=> 300, # innodb_file_per_table ), /* s3 */ 'DEFAULT' => array( 'db1019'=> 0, -- To view, visit https://gerrit.wikimedia.org/r/55001 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If96027077e3b0a86caf38706b7e6cabaf07485a1 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] class typo - change (operations/puppet)
Asher has submitted this change and it was merged.
Change subject: class typo
..
class typo
Change-Id: Id8d03005367a69f71aac03493e1e62b47681f201
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Asher: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index a75daa2..60d9aea 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -693,7 +693,7 @@
node /es100[5-7]\.eqiad\.wmnet/ {
if $hostname == "es1006" {
- class { role::coredb::e2 : mariadb => true }
+ class { role::coredb::es2 : mariadb => true }
} else {
include role::coredb::es2
}
@@ -701,7 +701,7 @@
node /es10(0[89]|10)\.eqiad\.wmnet/ {
if $hostname == "es1009" {
- class { role::coredb::e3 : mariadb => true }
+ class { role::coredb::es3 : mariadb => true }
} else {
include role::coredb::es3
}
--
To view, visit https://gerrit.wikimedia.org/r/55000
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id8d03005367a69f71aac03493e1e62b47681f201
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
Gerrit-Reviewer: Asher
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] class typo - change (operations/puppet)
Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55000
Change subject: class typo
..
class typo
Change-Id: Id8d03005367a69f71aac03493e1e62b47681f201
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/00/55000/1
diff --git a/manifests/site.pp b/manifests/site.pp
index a75daa2..60d9aea 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -693,7 +693,7 @@
node /es100[5-7]\.eqiad\.wmnet/ {
if $hostname == "es1006" {
- class { role::coredb::e2 : mariadb => true }
+ class { role::coredb::es2 : mariadb => true }
} else {
include role::coredb::es2
}
@@ -701,7 +701,7 @@
node /es10(0[89]|10)\.eqiad\.wmnet/ {
if $hostname == "es1009" {
- class { role::coredb::e3 : mariadb => true }
+ class { role::coredb::es3 : mariadb => true }
} else {
include role::coredb::es3
}
--
To view, visit https://gerrit.wikimedia.org/r/55000
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8d03005367a69f71aac03493e1e62b47681f201
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] es100[69] to mariadb - change (operations/puppet)
Asher has submitted this change and it was merged.
Change subject: es100[69] to mariadb
..
es100[69] to mariadb
Change-Id: I4bf506f5d88fe98ed7f38e4352aac735a52594fd
---
M manifests/site.pp
1 file changed, 10 insertions(+), 2 deletions(-)
Approvals:
Asher: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index b22f6a5..13c7040 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -692,11 +692,19 @@
}
node /es100[5-7]\.eqiad\.wmnet/ {
- include role::coredb::es2
+ if $hostname == "es1006" {
+ class { role::coredb::e2 : mariadb => true }
+ } else {
+ include role::coredb::es2
+ }
}
node /es10(0[89]|10)\.eqiad\.wmnet/ {
- include role::coredb::es3
+ if $hostname == "es1009" {
+ class { role::coredb::e3 : mariadb => true }
+ } else {
+ include role::coredb::es3
+ }
}
node "fenari.wikimedia.org" {
--
To view, visit https://gerrit.wikimedia.org/r/54998
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4bf506f5d88fe98ed7f38e4352aac735a52594fd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
Gerrit-Reviewer: Asher
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] es100[69] to mariadb - change (operations/puppet)
Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54998
Change subject: es100[69] to mariadb
..
es100[69] to mariadb
Change-Id: I4bf506f5d88fe98ed7f38e4352aac735a52594fd
---
M manifests/site.pp
1 file changed, 10 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/98/54998/1
diff --git a/manifests/site.pp b/manifests/site.pp
index b22f6a5..13c7040 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -692,11 +692,19 @@
}
node /es100[5-7]\.eqiad\.wmnet/ {
- include role::coredb::es2
+ if $hostname == "es1006" {
+ class { role::coredb::e2 : mariadb => true }
+ } else {
+ include role::coredb::es2
+ }
}
node /es10(0[89]|10)\.eqiad\.wmnet/ {
- include role::coredb::es3
+ if $hostname == "es1009" {
+ class { role::coredb::e3 : mariadb => true }
+ } else {
+ include role::coredb::es3
+ }
}
node "fenari.wikimedia.org" {
--
To view, visit https://gerrit.wikimedia.org/r/54998
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4bf506f5d88fe98ed7f38e4352aac735a52594fd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pulling es100[69], returning pmtpa s1 dbs - change (operations/mediawiki-config)
Asher has submitted this change and it was merged. Change subject: pulling es100[69], returning pmtpa s1 dbs .. pulling es100[69], returning pmtpa s1 dbs Change-Id: Id0bacb17038ecc82dbc8070fc98009a532397c31 --- M wmf-config/db-eqiad.php M wmf-config/db-pmtpa.php 2 files changed, 5 insertions(+), 5 deletions(-) Approvals: Asher: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index bee7b66..a8ef6f3 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -262,13 +262,13 @@ # es2 'cluster24' => array( '10.64.16.153' => 1, # es1005 - '10.64.16.154' => 3, # es1006 + #'10.64.16.154' => 3, # es1006 '10.64.32.17' => 1, # es1007 snapshot host ), # es3 'cluster25' => array( '10.64.32.18' => 1, # es1008 - '10.64.32.19' => 3, # es1009 + #'10.64.32.19' => 3, # es1009 '10.64.32.20' => 1, # es1010 snapshot host ), # ExtensionStore shard1 - initially for AFTv5 diff --git a/wmf-config/db-pmtpa.php b/wmf-config/db-pmtpa.php index 65aa9df..ef1b99f 100644 --- a/wmf-config/db-pmtpa.php +++ b/wmf-config/db-pmtpa.php @@ -82,10 +82,10 @@ 'sectionLoads' => array( 's1' => array( 'db1017'=> 0, - #'db63'=> 0, # pmtpa master - #'db32' => 0, # snapshot host + 'db63'=> 0, # pmtpa master + 'db32'=> 0, # snapshot host 'db59'=> 200, # special contrib, watchlist, etc - #'db60'=> 400, + 'db60'=> 400, 'db69'=> 400, 'db71'=> 400, # innodb_file_per_table ), -- To view, visit https://gerrit.wikimedia.org/r/54996 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id0bacb17038ecc82dbc8070fc98009a532397c31 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher Gerrit-Reviewer: Asher Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pulling es100[69], returning pmtpa dbs - change (operations/mediawiki-config)
Asher has uploaded a new change for review. https://gerrit.wikimedia.org/r/54996 Change subject: pulling es100[69], returning pmtpa dbs .. pulling es100[69], returning pmtpa dbs Change-Id: Id0bacb17038ecc82dbc8070fc98009a532397c31 --- M wmf-config/db-eqiad.php M wmf-config/db-pmtpa.php 2 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/96/54996/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index bee7b66..a8ef6f3 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -262,13 +262,13 @@ # es2 'cluster24' => array( '10.64.16.153' => 1, # es1005 - '10.64.16.154' => 3, # es1006 + #'10.64.16.154' => 3, # es1006 '10.64.32.17' => 1, # es1007 snapshot host ), # es3 'cluster25' => array( '10.64.32.18' => 1, # es1008 - '10.64.32.19' => 3, # es1009 + #'10.64.32.19' => 3, # es1009 '10.64.32.20' => 1, # es1010 snapshot host ), # ExtensionStore shard1 - initially for AFTv5 diff --git a/wmf-config/db-pmtpa.php b/wmf-config/db-pmtpa.php index 65aa9df..ef1b99f 100644 --- a/wmf-config/db-pmtpa.php +++ b/wmf-config/db-pmtpa.php @@ -82,10 +82,10 @@ 'sectionLoads' => array( 's1' => array( 'db1017'=> 0, - #'db63'=> 0, # pmtpa master - #'db32' => 0, # snapshot host + 'db63'=> 0, # pmtpa master + 'db32'=> 0, # snapshot host 'db59'=> 200, # special contrib, watchlist, etc - #'db60'=> 400, + 'db60'=> 400, 'db69'=> 400, 'db71'=> 400, # innodb_file_per_table ), -- To view, visit https://gerrit.wikimedia.org/r/54996 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id0bacb17038ecc82dbc8070fc98009a532397c31 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] missing curly bracket - change (operations/puppet)
Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54978
Change subject: missing curly bracket
..
missing curly bracket
Change-Id: I448b301f72337d1bca62e96cf8afc4847f567058
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/78/54978/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 5e1982c..2f98cc9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -481,7 +481,7 @@
if $hostname =~ /^db10(51|52)/ {
class { role::coredb::s1 : innodb_file_per_table => true,
mariadb => true }
- elsif $hostname =~ /^db10(43|49)/ {
+ } elsif $hostname =~ /^db10(43|49)/ {
class { role::coredb::s1 : mariadb => true }
} else {
include role::coredb::s1
--
To view, visit https://gerrit.wikimedia.org/r/54978
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I448b301f72337d1bca62e96cf8afc4847f567058
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] adding db105[12] - change (operations/puppet)
Asher has submitted this change and it was merged.
Change subject: adding db105[12]
..
adding db105[12]
Change-Id: I248cf2d1ba74b7193b9c1eaf3030bce33bcde4fe
---
M manifests/site.pp
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Asher: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 62f1cf3..5e1982c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -473,13 +473,15 @@
}
# eqiad dbs
-node /^db10(01|17|42|43|49|50)\.eqiad\.wmnet/ {
+node /^db10(01|17|42|43|49|50|51|52)\.eqiad\.wmnet/ {
if $hostname =~ /^db10(01|17)/ {
$ganglia_aggregator = "true"
include mha::manager
}
- if $hostname =~ /^db10(43|49)/ {
+ if $hostname =~ /^db10(51|52)/ {
+ class { role::coredb::s1 : innodb_file_per_table => true,
mariadb => true }
+ elsif $hostname =~ /^db10(43|49)/ {
class { role::coredb::s1 : mariadb => true }
} else {
include role::coredb::s1
--
To view, visit https://gerrit.wikimedia.org/r/54976
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I248cf2d1ba74b7193b9c1eaf3030bce33bcde4fe
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
Gerrit-Reviewer: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] adding db105[12] - change (operations/puppet)
Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54976
Change subject: adding db105[12]
..
adding db105[12]
Change-Id: I248cf2d1ba74b7193b9c1eaf3030bce33bcde4fe
---
M manifests/site.pp
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/76/54976/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 62f1cf3..5e1982c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -473,13 +473,15 @@
}
# eqiad dbs
-node /^db10(01|17|42|43|49|50)\.eqiad\.wmnet/ {
+node /^db10(01|17|42|43|49|50|51|52)\.eqiad\.wmnet/ {
if $hostname =~ /^db10(01|17)/ {
$ganglia_aggregator = "true"
include mha::manager
}
- if $hostname =~ /^db10(43|49)/ {
+ if $hostname =~ /^db10(51|52)/ {
+ class { role::coredb::s1 : innodb_file_per_table => true,
mariadb => true }
+ elsif $hostname =~ /^db10(43|49)/ {
class { role::coredb::s1 : mariadb => true }
} else {
include role::coredb::s1
--
To view, visit https://gerrit.wikimedia.org/r/54976
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I248cf2d1ba74b7193b9c1eaf3030bce33bcde4fe
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] db1049 -> mariadb - change (operations/puppet)
Asher has submitted this change and it was merged.
Change subject: db1049 -> mariadb
..
db1049 -> mariadb
Change-Id: Icab905690dc8f53c577ac8b544054bac57f3b77b
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Asher: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 641ee5d..62f1cf3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -479,7 +479,7 @@
include mha::manager
}
- if $hostname == "db1043" {
+ if $hostname =~ /^db10(43|49)/ {
class { role::coredb::s1 : mariadb => true }
} else {
include role::coredb::s1
--
To view, visit https://gerrit.wikimedia.org/r/54946
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icab905690dc8f53c577ac8b544054bac57f3b77b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
Gerrit-Reviewer: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] db1049 -> mariadb - change (operations/puppet)
Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54946
Change subject: db1049 -> mariadb
..
db1049 -> mariadb
Change-Id: Icab905690dc8f53c577ac8b544054bac57f3b77b
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/46/54946/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 641ee5d..62f1cf3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -479,7 +479,7 @@
include mha::manager
}
- if $hostname == "db1043" {
+ if $hostname =~ /^db10(43|49)/ {
class { role::coredb::s1 : mariadb => true }
} else {
include role::coredb::s1
--
To view, visit https://gerrit.wikimedia.org/r/54946
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icab905690dc8f53c577ac8b544054bac57f3b77b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] converting the reset of s1 pmtpa to mariadb - change (operations/puppet)
Asher has submitted this change and it was merged.
Change subject: converting the reset of s1 pmtpa to mariadb
..
converting the reset of s1 pmtpa to mariadb
Change-Id: I196373520c72a89e0fa5bfc874f51ff2796cbb0a
---
M manifests/site.pp
1 file changed, 2 insertions(+), 4 deletions(-)
Approvals:
Asher: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 46510e8..13607bf 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -341,12 +341,10 @@
# pmtpa dbs
node /^db(32|59|60|63|69|71)\.pmtpa\.wmnet/ {
- if $hostname =~ /^db(59|69)/ {
- class { role::coredb::s1 : mariadb => true }
- } elsif $hostname == "db71"{
+ if $hostname == "db71"{
class { role::coredb::s1 : innodb_file_per_table => true,
mariadb => true }
} else {
- include role::coredb::s1
+ class { role::coredb::s1 : mariadb => true }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/54889
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I196373520c72a89e0fa5bfc874f51ff2796cbb0a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
Gerrit-Reviewer: Asher
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] converting the reset of s1 pmtpa to mariadb - change (operations/puppet)
Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54889
Change subject: converting the reset of s1 pmtpa to mariadb
..
converting the reset of s1 pmtpa to mariadb
Change-Id: I196373520c72a89e0fa5bfc874f51ff2796cbb0a
---
M manifests/site.pp
1 file changed, 2 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/89/54889/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 46510e8..13607bf 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -341,12 +341,10 @@
# pmtpa dbs
node /^db(32|59|60|63|69|71)\.pmtpa\.wmnet/ {
- if $hostname =~ /^db(59|69)/ {
- class { role::coredb::s1 : mariadb => true }
- } elsif $hostname == "db71"{
+ if $hostname == "db71"{
class { role::coredb::s1 : innodb_file_per_table => true,
mariadb => true }
} else {
- include role::coredb::s1
+ class { role::coredb::s1 : mariadb => true }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/54889
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I196373520c72a89e0fa5bfc874f51ff2796cbb0a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pulling dbs for upgrades, returning others - change (operations/mediawiki-config)
Asher has submitted this change and it was merged. Change subject: pulling dbs for upgrades, returning others .. pulling dbs for upgrades, returning others Change-Id: I1f1dfbcfdcd1e6a58e30edc6db1623cee3f196d5 --- M wmf-config/db-pmtpa.php 1 file changed, 17 insertions(+), 17 deletions(-) Approvals: Asher: Verified; Looks good to me, approved diff --git a/wmf-config/db-pmtpa.php b/wmf-config/db-pmtpa.php index ec789f4..65aa9df 100644 --- a/wmf-config/db-pmtpa.php +++ b/wmf-config/db-pmtpa.php @@ -82,54 +82,54 @@ 'sectionLoads' => array( 's1' => array( 'db1017'=> 0, - 'db63'=> 0, # pmtpa master - 'db32'=> 0, # snapshot host + #'db63'=> 0, # pmtpa master + #'db32' => 0, # snapshot host 'db59'=> 200, # special contrib, watchlist, etc - 'db60'=> 400, - #'db69'=> 400, # slave stopped, also being used for dumping. PY: 20130308 - #'db71'=> 400, # enagaged in a mysqldump. PY: 20130305 + #'db60'=> 400, + 'db69'=> 400, + 'db71'=> 400, # innodb_file_per_table ), 's2' => array( 'db1034'=> 0, 'db54'=> 0, # pmtpa master 'db52'=> 300, - #'db53' => 100, # snapshot host # slave stopped, also being used for dumping. PY: 20130308 - #'db57' => 300, # enagaged in a mysqldump. PY: 20130305 + #'db53' => 100, # snapshot host + #'db57' => 300, # innodb_file_per_table ), /* s3 */ 'DEFAULT' => array( 'db1019'=> 0, 'db34'=> 0, # pmtpa master 'db39'=> 400, - #'db64' => 200, # snapshot host # slave stopped, also being used for dumping. PY: 20130308 - #'db66' => 400, # enagaged in a mysqldump. PY: 20130305 + 'db64'=> 200, # snapshot host + 'db66'=> 400, # innodb_file_per_table ), 's4' => array( 'db1038' => 0, 'db31' => 0, # pmtpa master - #'db33' => 100, # Snapshot host # slave stopped, also being used for dumping. PY: 20130308 + 'db33' => 100, # Snapshot host 'db51' => 500, - #'db65' => 500, # enagaged in a mysqldump. PY: 20130305 + 'db65' => 500, # innodb_file_per_table ), 's5' => array( 'db1039' => 0, 'db45' => 0, # pmtpa master 'db35' => 500, - #'db44' => 500, # snapshot host # slave stopped, also being used for dumping. PY: 20130308 - #'db55' => 1000, # enagaged in a mysqldump. PY: 20130305 + 'db44' => 500, # snapshot host + 'db55' => 1000, # innodb_file_per_table ), 's6' => array( 'db1006' => 0, 'db47' => 0, # pmtpa master 'db43' => 1000, # hw died 12/18/2011 - #'db46'=> 400, # snapshot host # slave stopped, also being used for dumping. PY: 20130308 - #'db50'=> 1000, # enagaged in a mysqldump. PY: 20130305 + 'db46' => 400, # snapshot host + 'db50' => 1000, # innodb_file_per_table ), 's7' => array( 'db1041' => 0, 'db37' => 0, # pmtpa master - #'db56' => 400, # snapshot host # slave stopped, also being used for dumping. PY: 20130308 + 'db56' => 400, # snapshot host 'db58' => 500, - #'db68' => 700, # enagaged in a mysqldump. PY: 20130305 + 'db68' => 700, # innodb_file_per_table ), ), -- To view, visit https://gerrit.wikimedia.org/r/54619 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1f1dfbcfdcd1e6a58e30edc6db1623cee3f196d5 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher Gerrit-Reviewer: Asher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pulling dbs for upgrades, returning others - change (operations/mediawiki-config)
Asher has uploaded a new change for review. https://gerrit.wikimedia.org/r/54619 Change subject: pulling dbs for upgrades, returning others .. pulling dbs for upgrades, returning others Change-Id: I1f1dfbcfdcd1e6a58e30edc6db1623cee3f196d5 --- M wmf-config/db-pmtpa.php 1 file changed, 17 insertions(+), 17 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/19/54619/1 diff --git a/wmf-config/db-pmtpa.php b/wmf-config/db-pmtpa.php index ec789f4..65aa9df 100644 --- a/wmf-config/db-pmtpa.php +++ b/wmf-config/db-pmtpa.php @@ -82,54 +82,54 @@ 'sectionLoads' => array( 's1' => array( 'db1017'=> 0, - 'db63'=> 0, # pmtpa master - 'db32'=> 0, # snapshot host + #'db63'=> 0, # pmtpa master + #'db32' => 0, # snapshot host 'db59'=> 200, # special contrib, watchlist, etc - 'db60'=> 400, - #'db69'=> 400, # slave stopped, also being used for dumping. PY: 20130308 - #'db71'=> 400, # enagaged in a mysqldump. PY: 20130305 + #'db60'=> 400, + 'db69'=> 400, + 'db71'=> 400, # innodb_file_per_table ), 's2' => array( 'db1034'=> 0, 'db54'=> 0, # pmtpa master 'db52'=> 300, - #'db53' => 100, # snapshot host # slave stopped, also being used for dumping. PY: 20130308 - #'db57' => 300, # enagaged in a mysqldump. PY: 20130305 + #'db53' => 100, # snapshot host + #'db57' => 300, # innodb_file_per_table ), /* s3 */ 'DEFAULT' => array( 'db1019'=> 0, 'db34'=> 0, # pmtpa master 'db39'=> 400, - #'db64' => 200, # snapshot host # slave stopped, also being used for dumping. PY: 20130308 - #'db66' => 400, # enagaged in a mysqldump. PY: 20130305 + 'db64'=> 200, # snapshot host + 'db66'=> 400, # innodb_file_per_table ), 's4' => array( 'db1038' => 0, 'db31' => 0, # pmtpa master - #'db33' => 100, # Snapshot host # slave stopped, also being used for dumping. PY: 20130308 + 'db33' => 100, # Snapshot host 'db51' => 500, - #'db65' => 500, # enagaged in a mysqldump. PY: 20130305 + 'db65' => 500, # innodb_file_per_table ), 's5' => array( 'db1039' => 0, 'db45' => 0, # pmtpa master 'db35' => 500, - #'db44' => 500, # snapshot host # slave stopped, also being used for dumping. PY: 20130308 - #'db55' => 1000, # enagaged in a mysqldump. PY: 20130305 + 'db44' => 500, # snapshot host + 'db55' => 1000, # innodb_file_per_table ), 's6' => array( 'db1006' => 0, 'db47' => 0, # pmtpa master 'db43' => 1000, # hw died 12/18/2011 - #'db46'=> 400, # snapshot host # slave stopped, also being used for dumping. PY: 20130308 - #'db50'=> 1000, # enagaged in a mysqldump. PY: 20130305 + 'db46' => 400, # snapshot host + 'db50' => 1000, # innodb_file_per_table ), 's7' => array( 'db1041' => 0, 'db37' => 0, # pmtpa master - #'db56' => 400, # snapshot host # slave stopped, also being used for dumping. PY: 20130308 + 'db56' => 400, # snapshot host 'db58' => 500, - #'db68' => 700, # enagaged in a mysqldump. PY: 20130305 + 'db68' => 700, # innodb_file_per_table ), ), -- To view, visit https://gerrit.wikimedia.org/r/54619 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1f1dfbcfdcd1e6a58e30edc6db1623cee3f196d5 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix hostname regex - change (operations/puppet)
Asher has submitted this change and it was merged.
Change subject: fix hostname regex
..
fix hostname regex
Change-Id: I71a1fee9aec44c508da73560947b10defaa3fe7f
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Asher: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index f15509d..46510e8 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -341,7 +341,7 @@
# pmtpa dbs
node /^db(32|59|60|63|69|71)\.pmtpa\.wmnet/ {
- if $hostname =~ /^db(59|69)\.pmtpa/ {
+ if $hostname =~ /^db(59|69)/ {
class { role::coredb::s1 : mariadb => true }
} elsif $hostname == "db71"{
class { role::coredb::s1 : innodb_file_per_table => true,
mariadb => true }
--
To view, visit https://gerrit.wikimedia.org/r/54617
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I71a1fee9aec44c508da73560947b10defaa3fe7f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
Gerrit-Reviewer: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix hostname regex - change (operations/puppet)
Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54617
Change subject: fix hostname regex
..
fix hostname regex
Change-Id: I71a1fee9aec44c508da73560947b10defaa3fe7f
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/17/54617/1
diff --git a/manifests/site.pp b/manifests/site.pp
index f15509d..46510e8 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -341,7 +341,7 @@
# pmtpa dbs
node /^db(32|59|60|63|69|71)\.pmtpa\.wmnet/ {
- if $hostname =~ /^db(59|69)\.pmtpa/ {
+ if $hostname =~ /^db(59|69)/ {
class { role::coredb::s1 : mariadb => true }
} elsif $hostname == "db71"{
class { role::coredb::s1 : innodb_file_per_table => true,
mariadb => true }
--
To view, visit https://gerrit.wikimedia.org/r/54617
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I71a1fee9aec44c508da73560947b10defaa3fe7f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] woops, incorrect use of quotes - change (operations/puppet)
Asher has submitted this change and it was merged.
Change subject: woops, incorrect use of quotes
..
woops, incorrect use of quotes
Change-Id: Ie0c53418d915921bfe3c30b3a483a1e27e8cfaf4
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Asher: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 944162a..f15509d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -341,7 +341,7 @@
# pmtpa dbs
node /^db(32|59|60|63|69|71)\.pmtpa\.wmnet/ {
- if $hostname =~ "/^db(59|69)\.pmtpa/" {
+ if $hostname =~ /^db(59|69)\.pmtpa/ {
class { role::coredb::s1 : mariadb => true }
} elsif $hostname == "db71"{
class { role::coredb::s1 : innodb_file_per_table => true,
mariadb => true }
--
To view, visit https://gerrit.wikimedia.org/r/54616
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0c53418d915921bfe3c30b3a483a1e27e8cfaf4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
Gerrit-Reviewer: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] woops, incorrect use of quotes - change (operations/puppet)
Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54616
Change subject: woops, incorrect use of quotes
..
woops, incorrect use of quotes
Change-Id: Ie0c53418d915921bfe3c30b3a483a1e27e8cfaf4
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/16/54616/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 944162a..f15509d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -341,7 +341,7 @@
# pmtpa dbs
node /^db(32|59|60|63|69|71)\.pmtpa\.wmnet/ {
- if $hostname =~ "/^db(59|69)\.pmtpa/" {
+ if $hostname =~ /^db(59|69)\.pmtpa/ {
class { role::coredb::s1 : mariadb => true }
} elsif $hostname == "db71"{
class { role::coredb::s1 : innodb_file_per_table => true,
mariadb => true }
--
To view, visit https://gerrit.wikimedia.org/r/54616
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0c53418d915921bfe3c30b3a483a1e27e8cfaf4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] db69, 71 to mariadb - change (operations/puppet)
Asher has submitted this change and it was merged.
Change subject: db69,71 to mariadb
..
db69,71 to mariadb
Change-Id: Icda356252da0885890b48df675943a38ce0ff7a6
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Asher: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 10c2a93..944162a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -341,10 +341,10 @@
# pmtpa dbs
node /^db(32|59|60|63|69|71)\.pmtpa\.wmnet/ {
- if $hostname == "db59" {
+ if $hostname =~ "/^db(59|69)\.pmtpa/" {
class { role::coredb::s1 : mariadb => true }
} elsif $hostname == "db71"{
- class { role::coredb::s1 : innodb_file_per_table => true }
+ class { role::coredb::s1 : innodb_file_per_table => true,
mariadb => true }
} else {
include role::coredb::s1
}
--
To view, visit https://gerrit.wikimedia.org/r/54615
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icda356252da0885890b48df675943a38ce0ff7a6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
Gerrit-Reviewer: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] db69, 71 to mariadb - change (operations/puppet)
Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54615
Change subject: db69,71 to mariadb
..
db69,71 to mariadb
Change-Id: Icda356252da0885890b48df675943a38ce0ff7a6
---
M manifests/site.pp
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/15/54615/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 10c2a93..944162a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -341,10 +341,10 @@
# pmtpa dbs
node /^db(32|59|60|63|69|71)\.pmtpa\.wmnet/ {
- if $hostname == "db59" {
+ if $hostname =~ "/^db(59|69)\.pmtpa/" {
class { role::coredb::s1 : mariadb => true }
} elsif $hostname == "db71"{
- class { role::coredb::s1 : innodb_file_per_table => true }
+ class { role::coredb::s1 : innodb_file_per_table => true,
mariadb => true }
} else {
include role::coredb::s1
}
--
To view, visit https://gerrit.wikimedia.org/r/54615
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icda356252da0885890b48df675943a38ce0ff7a6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert "pulling db per shard for upgrads" - change (operations/mediawiki-config)
Asher has submitted this change and it was merged. Change subject: Revert "pulling db per shard for upgrads" .. Revert "pulling db per shard for upgrads" This reverts commit 8eec1cf9e8dbab810b9d9728aa739bcfb406ae44 Change-Id: I80e50f7edcd2f751daf26c70653830ff66b582d1 --- M wmf-config/db-eqiad.php 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Asher: Verified; Looks good to me, approved diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 99ae3b8..bee7b66 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -96,32 +96,32 @@ /* s3 */ 'DEFAULT' => array( 'db1019'=> 0, 'db1003'=> 400, - #'db1010'=> 400, + 'db1010'=> 400, 'db1035'=> 100, # snapshot ), 's4' => array( 'db1038' => 0, 'db1004' => 400, - #'db1011' => 400, + 'db1011' => 400, 'db1020' => 100, # snapshot ), 's5' => array( 'db1039' => 0, 'db1005' => 100, # snapshot - #'db1026' => 400, + 'db1026' => 400, 'db1021' => 400, ), 's6' => array( 'db1006' => 0, 'db1022' => 100, # snapshot - #'db1027' => 400, + 'db1027' => 400, 'db1040' => 400, ), 's7' => array( 'db1041' => 0, 'db1007' => 100, # snapshot 'db1024' => 400, - #'db1028' => 400, + 'db1028' => 400, ), ), -- To view, visit https://gerrit.wikimedia.org/r/54601 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I80e50f7edcd2f751daf26c70653830ff66b582d1 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher Gerrit-Reviewer: Asher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] enabling extended_keys since https://mariadb.atlassian.net/b... - change (operations/puppet)
Asher has submitted this change and it was merged.
Change subject: enabling extended_keys since
https://mariadb.atlassian.net/browse/MDEV-4220 has been fixed
..
enabling extended_keys since https://mariadb.atlassian.net/browse/MDEV-4220 has
been fixed
Change-Id: Id3b0bb1ab0af31896c8c031d37373a63cb9bd3cb
---
M modules/coredb_mysql/templates/prod.my.cnf.erb
1 file changed, 1 insertion(+), 3 deletions(-)
Approvals:
Asher: Verified; Looks good to me, approved
diff --git a/modules/coredb_mysql/templates/prod.my.cnf.erb
b/modules/coredb_mysql/templates/prod.my.cnf.erb
index eac9705..72dd962 100644
--- a/modules/coredb_mysql/templates/prod.my.cnf.erb
+++ b/modules/coredb_mysql/templates/prod.my.cnf.erb
@@ -65,9 +65,7 @@
<% if has_variable?("mariadb") and mariadb == true then -%>
query_cache_type=0
log_slow_verbosity=Query_plan
-# extended_keys disabled until https://mariadb.atlassian.net/browse/MDEV-4220
is fixed
-# optimizer_switch='extended_keys=on'
-optimizer_switch='mrr=on,mrr_cost_based=on,mrr_sort_keys=on,optimize_join_buffer_size=on'
+optimizer_switch='mrr=on,mrr_cost_based=on,mrr_sort_keys=on,optimize_join_buffer_size=on,extended_keys=on'
<% else %>
rpl_transaction_enabled
reserved_super_connections=20
--
To view, visit https://gerrit.wikimedia.org/r/54578
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id3b0bb1ab0af31896c8c031d37373a63cb9bd3cb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
Gerrit-Reviewer: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] enabling extended_keys since https://mariadb.atlassian.net/b... - change (operations/puppet)
Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54578
Change subject: enabling extended_keys since
https://mariadb.atlassian.net/browse/MDEV-4220 has been fixed
..
enabling extended_keys since https://mariadb.atlassian.net/browse/MDEV-4220 has
been fixed
Change-Id: Id3b0bb1ab0af31896c8c031d37373a63cb9bd3cb
---
M modules/coredb_mysql/templates/prod.my.cnf.erb
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/78/54578/1
diff --git a/modules/coredb_mysql/templates/prod.my.cnf.erb
b/modules/coredb_mysql/templates/prod.my.cnf.erb
index eac9705..72dd962 100644
--- a/modules/coredb_mysql/templates/prod.my.cnf.erb
+++ b/modules/coredb_mysql/templates/prod.my.cnf.erb
@@ -65,9 +65,7 @@
<% if has_variable?("mariadb") and mariadb == true then -%>
query_cache_type=0
log_slow_verbosity=Query_plan
-# extended_keys disabled until https://mariadb.atlassian.net/browse/MDEV-4220
is fixed
-# optimizer_switch='extended_keys=on'
-optimizer_switch='mrr=on,mrr_cost_based=on,mrr_sort_keys=on,optimize_join_buffer_size=on'
+optimizer_switch='mrr=on,mrr_cost_based=on,mrr_sort_keys=on,optimize_join_buffer_size=on,extended_keys=on'
<% else %>
rpl_transaction_enabled
reserved_super_connections=20
--
To view, visit https://gerrit.wikimedia.org/r/54578
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3b0bb1ab0af31896c8c031d37373a63cb9bd3cb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] upgrading one db per core shard in eqiad to mariadb - change (operations/puppet)
Asher has submitted this change and it was merged.
Change subject: upgrading one db per core shard in eqiad to mariadb
..
upgrading one db per core shard in eqiad to mariadb
Change-Id: Ibb608884e50bd9be790730fe639d0a0845451478
---
M manifests/site.pp
1 file changed, 25 insertions(+), 5 deletions(-)
Approvals:
Asher: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 436f6c7..10c216c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -497,11 +497,19 @@
}
node /^db10(03|10|19|35)\.eqiad\.wmnet/ {
- include role::coredb::s3
+ if $hostname == "db1010" {
+ class { role::coredb::s3 : mariadb => true }
+ } else {
+ include role::coredb::s3
+ }
}
node /^db10(04|11|20|38)\.eqiad\.wmnet/ {
- include role::coredb::s4
+ if $hostname == "db1011" {
+ class { role::coredb::s4 : mariadb => true }
+ } else {
+ include role::coredb::s4
+ }
}
node /^db10(05|21|26|39)\.eqiad\.wmnet/ {
@@ -509,15 +517,27 @@
$ganglia_aggregator = "true"
}
- include role::coredb::s5
+ if $hostname == "db1026" {
+ class { role::coredb::s5 : mariadb => true }
+ } else {
+ include role::coredb::s5
+ }
}
node /^db10(06|22|27|40)\.eqiad\.wmnet/ {
- include role::coredb::s6
+ if $hostname == "db1027" {
+ class { role::coredb::s6 : mariadb => true }
+ } else {
+ include role::coredb::s6
+ }
}
node /^db10(07|24|28|41)\.eqiad\.wmnet/ {
- include role::coredb::s7
+ if $hostname == "db1028" {
+ class { role::coredb::s7 : mariadb => true }
+ } else {
+ include role::coredb::s7
+ }
}
## x1 shard
--
To view, visit https://gerrit.wikimedia.org/r/54575
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb608884e50bd9be790730fe639d0a0845451478
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
Gerrit-Reviewer: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pulling db per shard for upgrads - change (operations/mediawiki-config)
Asher has submitted this change and it was merged. Change subject: pulling db per shard for upgrads .. pulling db per shard for upgrads Change-Id: Iebe7b063925639528d2db61f3bf1a3dd83738e06 --- M wmf-config/db-eqiad.php 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Asher: Verified; Looks good to me, approved diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index bee7b66..99ae3b8 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -96,32 +96,32 @@ /* s3 */ 'DEFAULT' => array( 'db1019'=> 0, 'db1003'=> 400, - 'db1010'=> 400, + #'db1010'=> 400, 'db1035'=> 100, # snapshot ), 's4' => array( 'db1038' => 0, 'db1004' => 400, - 'db1011' => 400, + #'db1011' => 400, 'db1020' => 100, # snapshot ), 's5' => array( 'db1039' => 0, 'db1005' => 100, # snapshot - 'db1026' => 400, + #'db1026' => 400, 'db1021' => 400, ), 's6' => array( 'db1006' => 0, 'db1022' => 100, # snapshot - 'db1027' => 400, + #'db1027' => 400, 'db1040' => 400, ), 's7' => array( 'db1041' => 0, 'db1007' => 100, # snapshot 'db1024' => 400, - 'db1028' => 400, + #'db1028' => 400, ), ), -- To view, visit https://gerrit.wikimedia.org/r/54576 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iebe7b063925639528d2db61f3bf1a3dd83738e06 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher Gerrit-Reviewer: Asher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pulling db per shard for upgrads - change (operations/mediawiki-config)
Asher has uploaded a new change for review. https://gerrit.wikimedia.org/r/54576 Change subject: pulling db per shard for upgrads .. pulling db per shard for upgrads Change-Id: Iebe7b063925639528d2db61f3bf1a3dd83738e06 --- 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/76/54576/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index bee7b66..99ae3b8 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -96,32 +96,32 @@ /* s3 */ 'DEFAULT' => array( 'db1019'=> 0, 'db1003'=> 400, - 'db1010'=> 400, + #'db1010'=> 400, 'db1035'=> 100, # snapshot ), 's4' => array( 'db1038' => 0, 'db1004' => 400, - 'db1011' => 400, + #'db1011' => 400, 'db1020' => 100, # snapshot ), 's5' => array( 'db1039' => 0, 'db1005' => 100, # snapshot - 'db1026' => 400, + #'db1026' => 400, 'db1021' => 400, ), 's6' => array( 'db1006' => 0, 'db1022' => 100, # snapshot - 'db1027' => 400, + #'db1027' => 400, 'db1040' => 400, ), 's7' => array( 'db1041' => 0, 'db1007' => 100, # snapshot 'db1024' => 400, - 'db1028' => 400, + #'db1028' => 400, ), ), -- To view, visit https://gerrit.wikimedia.org/r/54576 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iebe7b063925639528d2db61f3bf1a3dd83738e06 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] upgrading one db per core shard in eqiad to mariadb - change (operations/puppet)
Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54575
Change subject: upgrading one db per core shard in eqiad to mariadb
..
upgrading one db per core shard in eqiad to mariadb
Change-Id: Ibb608884e50bd9be790730fe639d0a0845451478
---
M manifests/site.pp
1 file changed, 25 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/75/54575/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 436f6c7..10c216c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -497,11 +497,19 @@
}
node /^db10(03|10|19|35)\.eqiad\.wmnet/ {
- include role::coredb::s3
+ if $hostname == "db1010" {
+ class { role::coredb::s3 : mariadb => true }
+ } else {
+ include role::coredb::s3
+ }
}
node /^db10(04|11|20|38)\.eqiad\.wmnet/ {
- include role::coredb::s4
+ if $hostname == "db1011" {
+ class { role::coredb::s4 : mariadb => true }
+ } else {
+ include role::coredb::s4
+ }
}
node /^db10(05|21|26|39)\.eqiad\.wmnet/ {
@@ -509,15 +517,27 @@
$ganglia_aggregator = "true"
}
- include role::coredb::s5
+ if $hostname == "db1026" {
+ class { role::coredb::s5 : mariadb => true }
+ } else {
+ include role::coredb::s5
+ }
}
node /^db10(06|22|27|40)\.eqiad\.wmnet/ {
- include role::coredb::s6
+ if $hostname == "db1027" {
+ class { role::coredb::s6 : mariadb => true }
+ } else {
+ include role::coredb::s6
+ }
}
node /^db10(07|24|28|41)\.eqiad\.wmnet/ {
- include role::coredb::s7
+ if $hostname == "db1028" {
+ class { role::coredb::s7 : mariadb => true }
+ } else {
+ include role::coredb::s7
+ }
}
## x1 shard
--
To view, visit https://gerrit.wikimedia.org/r/54575
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb608884e50bd9be790730fe639d0a0845451478
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disabling aft5 - change (operations/mediawiki-config)
Asher has submitted this change and it was merged.
Change subject: Disabling aft5
..
Disabling aft5
Change-Id: I47343734183acdfc5402ab370f705a064cca8b07
---
M wmf-config/CommonSettings.php
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Asher: Verified; Looks good to me, approved
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index f4f1452..20df05e 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2039,7 +2039,8 @@
}
if ( $wmgUseArticleFeedbackv5 ) {
- require_once( "$IP/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php"
);
+ ## Breaking the site -- disabled for now - Ryan; Mar 5, 2013
+ #require_once( "$IP/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php"
);
$wgArticleFeedbackv5Cluster = $wmgArticleFeedbackv5Cluster;
$wgArticleFeedbackv5Categories = $wmgArticleFeedbackv5Categories;
--
To view, visit https://gerrit.wikimedia.org/r/54101
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I47343734183acdfc5402ab370f705a064cca8b07
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ryan Lane
Gerrit-Reviewer: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] lower weight of es snapshot hosts - change (operations/mediawiki-config)
Asher has submitted this change and it was merged. Change subject: lower weight of es snapshot hosts .. lower weight of es snapshot hosts Change-Id: I212a4d165c736e7b0e5f6f598316b7a560b47587 --- M wmf-config/db-eqiad.php 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Asher: Verified; Looks good to me, approved diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 179eaa4..bee7b66 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -263,19 +263,19 @@ 'cluster24' => array( '10.64.16.153' => 1, # es1005 '10.64.16.154' => 3, # es1006 - '10.64.32.17' => 3, # es1007 + '10.64.32.17' => 1, # es1007 snapshot host ), # es3 'cluster25' => array( '10.64.32.18' => 1, # es1008 '10.64.32.19' => 3, # es1009 - '10.64.32.20' => 3, # es1010 + '10.64.32.20' => 1, # es1010 snapshot host ), # ExtensionStore shard1 - initially for AFTv5 'extension1' => array( '10.64.16.18' => 10, # db1029 '10.64.16.19' => 100, # db1030 - '10.64.16.20' => 40, # db1031 snapshot host + '10.64.16.20' => 20, # db1031 snapshot host ), ), -- To view, visit https://gerrit.wikimedia.org/r/54095 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I212a4d165c736e7b0e5f6f598316b7a560b47587 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher Gerrit-Reviewer: Asher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] lower weight of es snapshot hosts - change (operations/mediawiki-config)
Asher has uploaded a new change for review. https://gerrit.wikimedia.org/r/54095 Change subject: lower weight of es snapshot hosts .. lower weight of es snapshot hosts Change-Id: I212a4d165c736e7b0e5f6f598316b7a560b47587 --- 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/95/54095/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 179eaa4..bee7b66 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -263,19 +263,19 @@ 'cluster24' => array( '10.64.16.153' => 1, # es1005 '10.64.16.154' => 3, # es1006 - '10.64.32.17' => 3, # es1007 + '10.64.32.17' => 1, # es1007 snapshot host ), # es3 'cluster25' => array( '10.64.32.18' => 1, # es1008 '10.64.32.19' => 3, # es1009 - '10.64.32.20' => 3, # es1010 + '10.64.32.20' => 1, # es1010 snapshot host ), # ExtensionStore shard1 - initially for AFTv5 'extension1' => array( '10.64.16.18' => 10, # db1029 '10.64.16.19' => 100, # db1030 - '10.64.16.20' => 40, # db1031 snapshot host + '10.64.16.20' => 20, # db1031 snapshot host ), ), -- To view, visit https://gerrit.wikimedia.org/r/54095 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I212a4d165c736e7b0e5f6f598316b7a560b47587 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] udpprofile should be started at boot - change (operations/puppet)
Asher has submitted this change and it was merged.
Change subject: udpprofile should be started at boot
..
udpprofile should be started at boot
Change-Id: I7ddb1fac84395874c7d8aceb9ad3885ea21c8f10
---
M manifests/misc/udpprofile.pp
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Asher: Verified; Looks good to me, approved
diff --git a/manifests/misc/udpprofile.pp b/manifests/misc/udpprofile.pp
index 0ff3ff0..3694775 100644
--- a/manifests/misc/udpprofile.pp
+++ b/manifests/misc/udpprofile.pp
@@ -8,6 +8,7 @@
service { udpprofile:
require => Package[ 'udpprofile' ],
+enable => true,
ensure => running;
}
--
To view, visit https://gerrit.wikimedia.org/r/54079
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7ddb1fac84395874c7d8aceb9ad3885ea21c8f10
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
Gerrit-Reviewer: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] make redis persistence model configurable, use aof in role::... - change (operations/puppet)
Asher has submitted this change and it was merged.
Change subject: make redis persistence model configurable, use aof in
role::redisdb and rdb for sessions
..
make redis persistence model configurable, use aof in role::redisdb and rdb for
sessions
Change-Id: I88fa394f574867e3ed9b9bfb912a7b70807a84b4
---
M manifests/role/redisdb.pp
M modules/redis/manifests/init.pp
M modules/redis/templates/redis.conf.erb
3 files changed, 15 insertions(+), 7 deletions(-)
Approvals:
Asher: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/redisdb.pp b/manifests/role/redisdb.pp
index d1527c6..5c27ab8 100644
--- a/manifests/role/redisdb.pp
+++ b/manifests/role/redisdb.pp
@@ -17,6 +17,7 @@
class { "::redis":
maxmemory => $maxmemory,
+ persist => "aof",
redis_replication => $redis_replication,
}
diff --git a/modules/redis/manifests/init.pp b/modules/redis/manifests/init.pp
index 3c8c591..ddf51a2 100644
--- a/modules/redis/manifests/init.pp
+++ b/modules/redis/manifests/init.pp
@@ -2,10 +2,10 @@
class redis (
$port = 6379,
$dir = "/a/redis",
- $dbfilename = "dump.rdb",
$maxmemory = "1GB",
$maxmemory_policy = "volatile-lru",
$maxmemory_samples = 5,
+ $persist = "rdb", # [ rdb, aof, both ]
$redis_options = {},
$redis_replication = undef,
$package = "redis-server",
diff --git a/modules/redis/templates/redis.conf.erb
b/modules/redis/templates/redis.conf.erb
index fddfa4a..95d44b4 100644
--- a/modules/redis/templates/redis.conf.erb
+++ b/modules/redis/templates/redis.conf.erb
@@ -37,7 +37,7 @@
# unixsocketperm 755
# Close the connection after a client is idle for N seconds (0 to disable)
-timeout 120
+timeout 60
# Set server verbosity to 'debug'
# it can be one of:
@@ -88,9 +88,13 @@
# like in the following example:
#
# save ""
+<% if persist == "rdb" or persist == "both" -%>
save 900 1
save 300 100
-#save 60 1
+save 60 1
+<% else -%>
+# rdb disabled
+<% end -%>
# By default Redis will stop accepting writes if RDB snapshots are enabled
# (at least one save point) and the latest background save failed.
@@ -123,7 +127,7 @@
rdbchecksum yes
# The filename where to dump the DB
-dbfilename <%= dbfilename %>
+dbfilename <%= hostname %>-<%= port %>.rdb
# The working directory.
#
@@ -340,10 +344,13 @@
# with the better durability guarantees.
#
# Please check http://redis.io/topics/persistence for more information.
+<% if persist == "aof" or persist == "both" -%>
+appendonly yes
+<% else -%>
appendonly no
-
+<% end -%>
# The name of the append only file (default: "appendonly.aof")
-# appendfilename appendonly.aof
+appendfilename <%= hostname %>-<%= port %>.aof
# The fsync() call tells the Operating System to actually write data on disk
# instead to wait for more data in the output buffer. Some OS will really flush
@@ -408,7 +415,7 @@
# Specify a percentage of zero in order to disable the automatic AOF
# rewrite feature.
auto-aof-rewrite-percentage 100
-auto-aof-rewrite-min-size 64mb
+auto-aof-rewrite-min-size 512mb
LUA SCRIPTING ###
--
To view, visit https://gerrit.wikimedia.org/r/53873
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I88fa394f574867e3ed9b9bfb912a7b70807a84b4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
Gerrit-Reviewer: Asher
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] udpprofile should be started at boot - change (operations/puppet)
Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54079
Change subject: udpprofile should be started at boot
..
udpprofile should be started at boot
Change-Id: I7ddb1fac84395874c7d8aceb9ad3885ea21c8f10
---
M manifests/misc/udpprofile.pp
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/79/54079/1
diff --git a/manifests/misc/udpprofile.pp b/manifests/misc/udpprofile.pp
index 0ff3ff0..3694775 100644
--- a/manifests/misc/udpprofile.pp
+++ b/manifests/misc/udpprofile.pp
@@ -8,6 +8,7 @@
service { udpprofile:
require => Package[ 'udpprofile' ],
+enable => true,
ensure => running;
}
--
To view, visit https://gerrit.wikimedia.org/r/54079
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ddb1fac84395874c7d8aceb9ad3885ea21c8f10
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert "Bug 39482 - Rename "chapcomwiki" to "affcomwiki"" - change (operations/apache-config)
Asher has submitted this change and it was merged.
Change subject: Revert "Bug 39482 - Rename "chapcomwiki" to "affcomwiki""
..
Revert "Bug 39482 - Rename "chapcomwiki" to "affcomwiki""
This reverts commit 3aca8a7bc26b45caa4c9348b77386d5de852d608
Change-Id: Ifaf1c99f15772933a62faca6959cbbced38fec1b
---
M redirects.conf
M remnant.conf
2 files changed, 7 insertions(+), 12 deletions(-)
Approvals:
Asher: Verified; Looks good to me, approved
diff --git a/redirects.conf b/redirects.conf
index 1880fd5..a2abfc7 100644
--- a/redirects.conf
+++ b/redirects.conf
@@ -10,7 +10,6 @@
bugs.mediawiki.org \
bugzilla.mediawiki.org \
bugzilla.wikipedia.org \
-chapcom.wikimedia.org \
cs.wikimedia.org \
cz.wikibooks.org \
cz.wikimedia.org \
@@ -656,10 +655,6 @@
# sometime in 2013
RewriteCond %{HTTP_HOST} =wlm.wikimedia.org
RewriteRule ^(.*)$ http://toolserver.org/~erfgoed$1 [R=301,L,NE]
-
-# chapcom -> affcom
-RewriteCond %{HTTP_HOST} =chapcom.wikimedia.org
-RewriteRule ^(.*)$ https://affcom.wikimedia.org$1 [R=301,L,NE]
# tartupeedia.ee (WMEE-owned domain) - bug 44893
RewriteCond %{HTTP_HOST} (.*)tartupeedia\.ee$
diff --git a/remnant.conf b/remnant.conf
index 5c4e548..d60f16d 100644
--- a/remnant.conf
+++ b/remnant.conf
@@ -722,19 +722,19 @@
-# affcom wiki
+# Chapcom wiki
-DocumentRoot "/usr/local/apache/common/docroot/affcom"
-ServerName affcom.wikimedia.org
+DocumentRoot "/usr/local/apache/common/docroot/chapcom"
+ServerName chapcom.wikimedia.org
AllowEncodedSlashes On
RewriteEngine On
RewriteCond %{HTTP:X-Forwarded-Proto} !https
-RewriteRule ^/(.*)$ https://affcom.wikimedia.org/$1 [R=301,L]
+RewriteRule ^/(.*)$ https://chapcom.wikimedia.org/$1 [R=301,L]
# Primary wiki redirector:
-Alias /wiki /usr/local/apache/common/docroot/affcom/w/index.php
+Alias /wiki /usr/local/apache/common/docroot/chapcom/w/index.php
RewriteRule ^/$ /w/index.php
# UseMod compatibility URLs
@@ -747,12 +747,12 @@
# Configurable favicon
RewriteRule ^/favicon\.ico$ /w/favicon.php [L]
-
+
php_admin_flag engine on
-
+
php_admin_flag engine off
--
To view, visit https://gerrit.wikimedia.org/r/53914
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifaf1c99f15772933a62faca6959cbbced38fec1b
Gerrit-PatchSet: 1
Gerrit-Project: operations/apache-config
Gerrit-Branch: master
Gerrit-Owner: Reedy
Gerrit-Reviewer: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add 'pageId', 'revisionId', 'action' and 'isAnon' - change (mediawiki...NavigationTiming)
Asher has submitted this change and it was merged.
Change subject: Add 'pageId', 'revisionId', 'action' and 'isAnon'
..
Add 'pageId', 'revisionId', 'action' and 'isAnon'
We'd like to be able to attribute page performance to user action and
page content, so log them when available. Also log whether or not the
user was logged in, since caching behavior is contingent on it.
Change-Id: I087f2647e5aa1aa0a9535bf3dc0bfcfca646d72f
---
M NavigationTiming.php
M modules/ext.navigationTiming.js
2 files changed, 17 insertions(+), 5 deletions(-)
Approvals:
Asher: Verified; Looks good to me, approved
diff --git a/NavigationTiming.php b/NavigationTiming.php
index 1bd9cf7..39b09aa 100644
--- a/NavigationTiming.php
+++ b/NavigationTiming.php
@@ -21,7 +21,7 @@
'author' => array(
'Asher Feldman',
'Ori Livneh',
- 'Patrick Reilly'
+ 'Patrick Reilly',
),
'descriptionmsg' => 'navigationtiming-desc',
);
@@ -35,7 +35,7 @@
'schema.NavigationTiming' => array(
'class'=> 'ResourceLoaderSchemaModule',
'schema' => 'NavigationTiming',
- 'revision' => 5321444,
+ 'revision' => 5323808,
),
'ext.navigationTiming' => array(
'scripts' => 'ext.navigationTiming.js',
diff --git a/modules/ext.navigationTiming.js b/modules/ext.navigationTiming.js
index 540fe05..7aff935 100644
--- a/modules/ext.navigationTiming.js
+++ b/modules/ext.navigationTiming.js
@@ -24,9 +24,15 @@
function emitTiming() {
var event = {
- userAgent : navigator.userAgent,
- isHttps : location.protocol === 'https:'
- };
+ userAgent : navigator.userAgent,
+ isHttps : location.protocol === 'https:',
+ isAnon: mw.user.isAnon()
+ },
+ page = {
+ pageId : mw.config.get( 'wgArticleId' ),
+ revId : mw.config.get( 'wgCurRevisionId' ),
+ action : mw.config.get( 'wgAction' ) // view,
submit, etc.
+ };
if ( $.isPlainObject( window.Geo ) && typeof Geo.country ===
'string' ) {
event.originCountry = Geo.country;
@@ -50,6 +56,12 @@
event.redirecting = timing.redirectEnd -
timing.redirectStart;
}
+ // Omit page information for special pages: they don't have
real page
+ // IDs or revisions. (They appear as 0 to client-side code.)
+ if ( page.revId ) {
+ $.extend( event, page );
+ }
+
mw.eventLog.logEvent( 'NavigationTiming', event );
}
--
To view, visit https://gerrit.wikimedia.org/r/53896
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I087f2647e5aa1aa0a9535bf3dc0bfcfca646d72f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/NavigationTiming
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh
Gerrit-Reviewer: Asher
Gerrit-Reviewer: Ori.livneh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] make redis persistence model configurable, use aof in role::... - change (operations/puppet)
Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53873
Change subject: make redis persistence model configurable, use aof in
role::redisdb and rdb for sessions
..
make redis persistence model configurable, use aof in role::redisdb and rdb for
sessions
Change-Id: I88fa394f574867e3ed9b9bfb912a7b70807a84b4
---
M manifests/role/redisdb.pp
M modules/redis/manifests/init.pp
M modules/redis/templates/redis.conf.erb
3 files changed, 15 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/73/53873/1
diff --git a/manifests/role/redisdb.pp b/manifests/role/redisdb.pp
index d1527c6..5c27ab8 100644
--- a/manifests/role/redisdb.pp
+++ b/manifests/role/redisdb.pp
@@ -17,6 +17,7 @@
class { "::redis":
maxmemory => $maxmemory,
+ persist => "aof",
redis_replication => $redis_replication,
}
diff --git a/modules/redis/manifests/init.pp b/modules/redis/manifests/init.pp
index 3c8c591..ddf51a2 100644
--- a/modules/redis/manifests/init.pp
+++ b/modules/redis/manifests/init.pp
@@ -2,10 +2,10 @@
class redis (
$port = 6379,
$dir = "/a/redis",
- $dbfilename = "dump.rdb",
$maxmemory = "1GB",
$maxmemory_policy = "volatile-lru",
$maxmemory_samples = 5,
+ $persist = "rdb", # [ rdb, aof, both ]
$redis_options = {},
$redis_replication = undef,
$package = "redis-server",
diff --git a/modules/redis/templates/redis.conf.erb
b/modules/redis/templates/redis.conf.erb
index fddfa4a..95d44b4 100644
--- a/modules/redis/templates/redis.conf.erb
+++ b/modules/redis/templates/redis.conf.erb
@@ -37,7 +37,7 @@
# unixsocketperm 755
# Close the connection after a client is idle for N seconds (0 to disable)
-timeout 120
+timeout 60
# Set server verbosity to 'debug'
# it can be one of:
@@ -88,9 +88,13 @@
# like in the following example:
#
# save ""
+<% if persist == "rdb" or persist == "both" -%>
save 900 1
save 300 100
-#save 60 1
+save 60 1
+<% else -%>
+# rdb disabled
+<% end -%>
# By default Redis will stop accepting writes if RDB snapshots are enabled
# (at least one save point) and the latest background save failed.
@@ -123,7 +127,7 @@
rdbchecksum yes
# The filename where to dump the DB
-dbfilename <%= dbfilename %>
+dbfilename <%= hostname %>-<%= port %>.rdb
# The working directory.
#
@@ -340,10 +344,13 @@
# with the better durability guarantees.
#
# Please check http://redis.io/topics/persistence for more information.
+<% if persist == "aof" or persist == "both" -%>
+appendonly yes
+<% else -%>
appendonly no
-
+<% end -%>
# The name of the append only file (default: "appendonly.aof")
-# appendfilename appendonly.aof
+appendfilename <%= hostname %>-<%= port %>.aof
# The fsync() call tells the Operating System to actually write data on disk
# instead to wait for more data in the output buffer. Some OS will really flush
@@ -408,7 +415,7 @@
# Specify a percentage of zero in order to disable the automatic AOF
# rewrite feature.
auto-aof-rewrite-percentage 100
-auto-aof-rewrite-min-size 64mb
+auto-aof-rewrite-min-size 512mb
LUA SCRIPTING ###
--
To view, visit https://gerrit.wikimedia.org/r/53873
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I88fa394f574867e3ed9b9bfb912a7b70807a84b4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix class scoping - change (operations/puppet)
Asher has submitted this change and it was merged.
Change subject: fix class scoping
..
fix class scoping
Change-Id: Ie0cef903ed5e034138b446387f910872d06b0eb7
---
M manifests/role/redisdb.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Asher: Verified; Looks good to me, approved
diff --git a/manifests/role/redisdb.pp b/manifests/role/redisdb.pp
index d83cde6..d1527c6 100644
--- a/manifests/role/redisdb.pp
+++ b/manifests/role/redisdb.pp
@@ -15,7 +15,7 @@
include standard
- class { "redis":
+ class { "::redis":
maxmemory => $maxmemory,
redis_replication => $redis_replication,
}
--
To view, visit https://gerrit.wikimedia.org/r/53858
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0cef903ed5e034138b446387f910872d06b0eb7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
Gerrit-Reviewer: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use EventLogging; add configurable sampling - change (mediawiki...NavigationTiming)
Asher has submitted this change and it was merged.
Change subject: Use EventLogging; add configurable sampling
..
Use EventLogging; add configurable sampling
Adds configuration variable, $wgNavigationTimingSamplingFactor. When
set, one in that many requests will get logged.
The measurements are documented on the schema, at:
https://meta.wikimedia.org/wiki/Schema:NavigationTiming
Change-Id: I0d180e534fc318c8e7dbfe8f48f826029632f34b
---
M .jshintrc
D NavigationTiming.hooks.php
M NavigationTiming.i18n.php
M NavigationTiming.php
A README
M modules/ext.navigationTiming.js
D modules/jquery.crypt.js
D scripts/pre-commit
8 files changed, 140 insertions(+), 605 deletions(-)
Approvals:
Asher: Verified; Looks good to me, approved
diff --git a/.jshintrc b/.jshintrc
index 5f24c12..d6cc052 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -1,13 +1,36 @@
{
- "globals": {
- "$": true,
- "browser": true,
- "navigationtiming": true
- },
+ "predef": [
+ "Geo",
+ "QUnit",
+ "jQuery",
+ "mediaWiki",
+ "performance"
+ ],
- "maxerr": 50,
- "newcap": false,
- "plusplus": false,
- "supernew": true,
- "white": false
+ "bitwise": true,
+ "camelcase": true,
+ "curly": true,
+ "eqeqeq": true,
+ "forin": false,
+ "immed": true,
+ "latedef": true,
+ "newcap": true,
+ "noarg": true,
+ "noempty": true,
+ "nonew": true,
+ "quotmark": "single",
+ "regexp": false,
+ "undef": true,
+ "unused": true,
+ "strict": false,
+ "trailing": true,
+
+ "laxbreak": true,
+ "smarttabs": true,
+ "multistr": true,
+
+ "browser": true,
+
+ "nomen": true,
+ "onevar": true
}
diff --git a/NavigationTiming.hooks.php b/NavigationTiming.hooks.php
deleted file mode 100644
index f66750f..000
--- a/NavigationTiming.hooks.php
+++ /dev/null
@@ -1,25 +0,0 @@
-addModules( 'jquery.NavigationTiming' );
- return true;
- }
-}
diff --git a/NavigationTiming.i18n.php b/NavigationTiming.i18n.php
index 8a47415..e6f9cfc 100644
--- a/NavigationTiming.i18n.php
+++ b/NavigationTiming.i18n.php
@@ -1,6 +1,6 @@
'Navigation Timing for timing navigation',
+ 'navigationtiming-desc' => 'Adds client-side latency measurements
logging',
);
/** Message documentation (Message documentation)
@@ -20,6 +20,5 @@
* @author Asher Feldman
*/
$messages['qqq'] = array(
- 'navigationtiming-desc' => '{{desc}}',
+ 'navigationtiming-desc' =>
'{{desc|name=NavigationTiming|url=https://www.mediawiki.org/wiki/Extension:NavigationTiming}}',
);
-
diff --git a/NavigationTiming.php b/NavigationTiming.php
index 0dda4e3..1bd9cf7 100644
--- a/NavigationTiming.php
+++ b/NavigationTiming.php
@@ -6,46 +6,52 @@
* @ingroup Extensions
*
* @author Asher Feldman
- * @author Patrick Reilly
+ * @author Ori Livneh
+ * @author Patrick Reilly
+ *
* @license GPL v2 or later
* @version 0.1.1
*/
-if ( !defined( 'MEDIAWIKI' ) ) {
- die( 'This file is a MediaWiki extension, it is not a valid entry
point' );
-}
-
-/**
- * CONFIGURATION
- * These variables may be overridden in LocalSettings.php after you include the
- * extension file.
- */
-
-/** Setup */
$wgExtensionCredits['other'][] = array(
'path' => __FILE__,
'name' => 'NavigationTiming',
'version' => '0.0.1',
'url' => 'https://www.mediawiki.org/wiki/Extension:NavigationTiming',
- 'author' => array( 'Patrick Reilly', 'Asher Feldman' ),
+ 'author' => array(
+ 'Asher Feldman',
+ 'Ori Livneh',
+ 'Patrick Reilly'
+ ),
'descriptionmsg' => 'navigationtiming-desc',
);
-$dir = dirname( __FILE__ ) . '/';
-// Autoload classes
-$wgAutoloadClasses['NavigationTimingHooks'] = $dir .
'NavigationTiming.hooks.php';
+/** @var int|bool: If set, logs once per this many requests. False if unset.
**/
+$wgNavigationTimingSamplingFactor = false;
-// Hooked functions
-$wgHooks['BeforePageDisplay'][] = 'NavigationTimingHooks::beforePageDisplay';
+$wgExtensionMessagesFiles[ 'NavigationTiming' ] = __DIR__ .
'/NavigationTiming.i18n.php';
-// i18n
-$wgExtensionMessagesFiles['NavigationTiming'] = $dir .
'NavigationTiming.i18n.php';
-
-// Resource modules
-$ctResourceTemplate = array(
- 'localBasePath' => $dir . 'modules',
- 'remoteExtPath' => 'NavigationTiming/modules',
+$wgResourceModules += array(
+ 'schema.NavigationTiming' => array(
+ 'class'=> 'ResourceLoaderSchemaModule',
+ 'schema' => 'NavigationTiming',
+ 'revision' => 5321444,
+ ),
+ 'ext.navigationTiming' => array(
+ 'scripts' => 'ext.navigationTiming.js',
+ 'localBasePath' => __DI
[MediaWiki-commits] [Gerrit] fix class scoping - change (operations/puppet)
Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53858
Change subject: fix class scoping
..
fix class scoping
Change-Id: Ie0cef903ed5e034138b446387f910872d06b0eb7
---
M manifests/role/redisdb.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/58/53858/1
diff --git a/manifests/role/redisdb.pp b/manifests/role/redisdb.pp
index d83cde6..d1527c6 100644
--- a/manifests/role/redisdb.pp
+++ b/manifests/role/redisdb.pp
@@ -15,7 +15,7 @@
include standard
- class { "redis":
+ class { "::redis":
maxmemory => $maxmemory,
redis_replication => $redis_replication,
}
--
To view, visit https://gerrit.wikimedia.org/r/53858
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0cef903ed5e034138b446387f910872d06b0eb7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] initial redisdb role config patch set 2: ganglia config Chan... - change (operations/puppet)
Asher has submitted this change and it was merged.
Change subject: initial redisdb role config patch set 2: ganglia config
Change-Id: I819c79ba048fc14538db06a7aff956a9ca7f6460
..
initial redisdb role config
patch set 2: ganglia config
Change-Id: I819c79ba048fc14538db06a7aff956a9ca7f6460
---
M manifests/ganglia.pp
A manifests/role/redisdb.pp
M manifests/site.pp
M modules/redis/templates/redis.conf.erb
4 files changed, 43 insertions(+), 2 deletions(-)
Approvals:
Asher: Verified; Looks good to me, approved
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index ac8b652..cf82867 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -148,6 +148,9 @@
"parsoidcache" => {
"name" => "Parsoid Varnish",
"ip_oct"=> "38" },
+ "redis" => {
+ "name" => "Redis",
+ "ip_oct"=> "39" },
}
# NOTE: Do *not* add new clusters *per site* anymore,
# the site name will automatically be appended now,
diff --git a/manifests/role/redisdb.pp b/manifests/role/redisdb.pp
new file mode 100644
index 000..d83cde6
--- /dev/null
+++ b/manifests/role/redisdb.pp
@@ -0,0 +1,26 @@
+# role/redis.pp
+# db::redis
+
+# Virtual resource for the monitoring server
+@monitor_group { "redis_eqiad": description => "eqiad Redis" }
+@monitor_group { "redis_pmtpa": description => "pmtpa Redis" }
+
+class role::db::redis (
+ $maxmemory = inline_template("<%= (Float(memorysize.split[0]) *
0.82).round %>Gb"),
+ $redis_replication = undef,
+) {
+ $cluster = "redis"
+
+ system_role { "db::redis": description => "Redis server" }
+
+ include standard
+
+ class { "redis":
+ maxmemory => $maxmemory,
+ redis_replication => $redis_replication,
+ }
+
+ include redis::ganglia
+
+}
+
diff --git a/manifests/site.pp b/manifests/site.pp
index e7836ba..4dc3fc5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1336,7 +1336,8 @@
misc::blogs::wikimedia
}
-node /mc(1[0-9]|[0-9])\.pmtpa\.wmnet/ {
+
+node /^mc(1[0-9]|[0-9])\.pmtpa\.wmnet/ {
$cluster = "memcached"
if $hostname =~ /^mc[12]$/ {
$ganglia_aggregator = "true"
@@ -1386,7 +1387,7 @@
include redis::ganglia
}
-node /mc(10[01][0-9])\.eqiad\.wmnet/ {
+node /^mc(10[01][0-9])\.eqiad\.wmnet/ {
$cluster = "memcached"
if $hostname =~ /^mc100[12]$/ {
$ganglia_aggregator = "true"
@@ -1434,6 +1435,15 @@
include redis::ganglia
}
+node /^rdb100[12]\.eqiad\.wmnet/ {
+ $ganglia_aggregator = "true"
+
+ $redis_replication = {
+ 'rdb1002' => 'rdb1001'
+ }
+
+ class { role::db::redis : redis_replication => $redis_replication }
+}
node "mchenry.wikimedia.org" {
$gid = 500
diff --git a/modules/redis/templates/redis.conf.erb
b/modules/redis/templates/redis.conf.erb
index 8530b5e..fddfa4a 100644
--- a/modules/redis/templates/redis.conf.erb
+++ b/modules/redis/templates/redis.conf.erb
@@ -146,6 +146,8 @@
# slaveof
<% if @redis_replication and redis_replication.has_key?('site') and
redis_replication['site'] -%>
slaveof <%= redis_replication[hostname] %>.<%= redis_replication['site'] %>
<%= port %>
+<% elsif @redis_replication and redis_replication.has_key?(hostname) -%>
+slaveof <%= redis_replication[hostname] %> <%= port %>
<% end -%>
# If the master is password protected (using the "requirepass" configuration
--
To view, visit https://gerrit.wikimedia.org/r/53800
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I819c79ba048fc14538db06a7aff956a9ca7f6460
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
Gerrit-Reviewer: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] initial redisdb role config - change (operations/puppet)
Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53800
Change subject: initial redisdb role config
..
initial redisdb role config
Change-Id: I819c79ba048fc14538db06a7aff956a9ca7f6460
---
A manifests/role/redisdb.pp
M manifests/site.pp
M modules/redis/templates/redis.conf.erb
3 files changed, 38 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/00/53800/1
diff --git a/manifests/role/redisdb.pp b/manifests/role/redisdb.pp
new file mode 100644
index 000..d83cde6
--- /dev/null
+++ b/manifests/role/redisdb.pp
@@ -0,0 +1,26 @@
+# role/redis.pp
+# db::redis
+
+# Virtual resource for the monitoring server
+@monitor_group { "redis_eqiad": description => "eqiad Redis" }
+@monitor_group { "redis_pmtpa": description => "pmtpa Redis" }
+
+class role::db::redis (
+ $maxmemory = inline_template("<%= (Float(memorysize.split[0]) *
0.82).round %>Gb"),
+ $redis_replication = undef,
+) {
+ $cluster = "redis"
+
+ system_role { "db::redis": description => "Redis server" }
+
+ include standard
+
+ class { "redis":
+ maxmemory => $maxmemory,
+ redis_replication => $redis_replication,
+ }
+
+ include redis::ganglia
+
+}
+
diff --git a/manifests/site.pp b/manifests/site.pp
index e7836ba..3a45044 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1336,7 +1336,8 @@
misc::blogs::wikimedia
}
-node /mc(1[0-9]|[0-9])\.pmtpa\.wmnet/ {
+
+node /^mc(1[0-9]|[0-9])\.pmtpa\.wmnet/ {
$cluster = "memcached"
if $hostname =~ /^mc[12]$/ {
$ganglia_aggregator = "true"
@@ -1386,7 +1387,7 @@
include redis::ganglia
}
-node /mc(10[01][0-9])\.eqiad\.wmnet/ {
+node /^mc(10[01][0-9])\.eqiad\.wmnet/ {
$cluster = "memcached"
if $hostname =~ /^mc100[12]$/ {
$ganglia_aggregator = "true"
@@ -1434,6 +1435,13 @@
include redis::ganglia
}
+node /^rdb100[12]\.eqiad\.wmnet/ {
+ $redis_replication = {
+ 'rdb1002' => 'rdb1001'
+ }
+
+ class { role::db::redis : redis_replication => $redis_replication }
+}
node "mchenry.wikimedia.org" {
$gid = 500
diff --git a/modules/redis/templates/redis.conf.erb
b/modules/redis/templates/redis.conf.erb
index 8530b5e..fddfa4a 100644
--- a/modules/redis/templates/redis.conf.erb
+++ b/modules/redis/templates/redis.conf.erb
@@ -146,6 +146,8 @@
# slaveof
<% if @redis_replication and redis_replication.has_key?('site') and
redis_replication['site'] -%>
slaveof <%= redis_replication[hostname] %>.<%= redis_replication['site'] %>
<%= port %>
+<% elsif @redis_replication and redis_replication.has_key?(hostname) -%>
+slaveof <%= redis_replication[hostname] %> <%= port %>
<% end -%>
# If the master is password protected (using the "requirepass" configuration
--
To view, visit https://gerrit.wikimedia.org/r/53800
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I819c79ba048fc14538db06a7aff956a9ca7f6460
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert "pulling db1009 for upgrade" - change (operations/mediawiki-config)
Asher has submitted this change and it was merged. Change subject: Revert "pulling db1009 for upgrade" .. Revert "pulling db1009 for upgrade" This reverts commit e4664446af3d2ea3de7bbe419eae5957993c3146 Change-Id: I264735c28ca374f4e04d160955d4726c0c29a5bf --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Asher: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 8c4a85f..179eaa4 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -90,7 +90,7 @@ 's2' => array( 'db1034'=> 0, 'db1002'=> 400, - #'db1009'=> 400, + 'db1009'=> 400, 'db1018'=> 100, # snaphsot ), /* s3 */ 'DEFAULT' => array( -- To view, visit https://gerrit.wikimedia.org/r/53783 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I264735c28ca374f4e04d160955d4726c0c29a5bf Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher Gerrit-Reviewer: Asher Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] s@node /db@node /^db@g - change (operations/puppet)
Asher has submitted this change and it was merged.
Change subject: s@node /db@node /^db@g
..
s@node /db@node /^db@g
Change-Id: Ib5dd2b1e787556a1b3d46e4316cc7477ad2e6aba
---
M manifests/site.pp
1 file changed, 23 insertions(+), 23 deletions(-)
Approvals:
Asher: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 56f8118..e7836ba 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -340,7 +340,7 @@
}
# pmtpa dbs
-node /db(32|59|60|63|69|71)\.pmtpa\.wmnet/ {
+node /^db(32|59|60|63|69|71)\.pmtpa\.wmnet/ {
if $hostname == "db59" {
class { role::coredb::s1 : mariadb => true }
} elsif $hostname == "db71"{
@@ -350,7 +350,7 @@
}
}
-node /db(52|53|54|57)\.pmtpa\.wmnet/ {
+node /^db(52|53|54|57)\.pmtpa\.wmnet/ {
if $hostname == "db52" {
class { role::coredb::s2 : mariadb => true }
} elsif $hostname == "db57"{
@@ -360,7 +360,7 @@
}
}
-node /db(34|39|64|66)\.pmtpa\.wmnet/ {
+node /^db(34|39|64|66)\.pmtpa\.wmnet/ {
if $hostname == "db39" {
class { role::coredb::s3 : mariadb => true }
} elsif $hostname == "db66"{
@@ -370,7 +370,7 @@
}
}
-node /db(31|33|51|65)\.pmtpa\.wmnet/ {
+node /^db(31|33|51|65)\.pmtpa\.wmnet/ {
if $hostname =~ /^db51/ {
$ganglia_aggregator = "true"
}
@@ -383,7 +383,7 @@
}
}
-node /db(35|44|45|55)\.pmtpa\.wmnet/ {
+node /^db(35|44|45|55)\.pmtpa\.wmnet/ {
if $hostname == "db35" {
class { role::coredb::s5 : mariadb => true }
} elsif $hostname == "db55"{
@@ -393,7 +393,7 @@
}
}
-node /db(43|46|47|50)\.pmtpa\.wmnet/ {
+node /^db(43|46|47|50)\.pmtpa\.wmnet/ {
if $hostname =~ /^db50/ {
$ganglia_aggregator = "true"
}
@@ -406,7 +406,7 @@
}
}
-node /db(37|56|58|68)\.pmtpa\.wmnet/ {
+node /^db(37|56|58|68)\.pmtpa\.wmnet/ {
if $hostname == "db58" {
class { role::coredb::s7 : mariadb => true }
} elsif $hostname == "db68"{
@@ -417,7 +417,7 @@
}
## x1 shard
-node /db(36|38)\.pmtpa\.wmnet/ {
+node /^db(36|38)\.pmtpa\.wmnet/ {
include role::coredb::x1
}
@@ -435,7 +435,7 @@
}
## m2 shard
-node /db4[89]\.pmtpa\.wmnet/ {
+node /^db4[89]\.pmtpa\.wmnet/ {
include role::coredb::m2
}
@@ -445,12 +445,12 @@
}
## researchdb
-node /db67\.pmtpa\.wmnet/ {
+node /^db67\.pmtpa\.wmnet/ {
include role::coredb::researchdb
}
## pgehres special project
-node /db29\.pmtpa\.wmnet/{
+node /^db29\.pmtpa\.wmnet/{
$gid = 500
system_role { "role::admin_tools_sul_audit_db": description => "Admin
Tools/SUL Audit database" }
include base,
@@ -470,12 +470,12 @@
## not in use for various reasons
-node /db(42|6[12]|7[1-7])\.pmtpa\.wmnet/{
+node /^db(42|6[12]|7[1-7])\.pmtpa\.wmnet/{
include standard
}
# eqiad dbs
-node /db10(01|17|42|43|49|50)\.eqiad\.wmnet/ {
+node /^db10(01|17|42|43|49|50)\.eqiad\.wmnet/ {
if $hostname =~ /^db10(01|17)/ {
$ganglia_aggregator = "true"
include mha::manager
@@ -488,7 +488,7 @@
}
}
-node /db10(02|09|18|34)\.eqiad\.wmnet/ {
+node /^db10(02|09|18|34)\.eqiad\.wmnet/ {
if $hostname == "db1009" {
class { role::coredb::s2 : mariadb => true }
} else {
@@ -496,15 +496,15 @@
}
}
-node /db10(03|10|19|35)\.eqiad\.wmnet/ {
+node /^db10(03|10|19|35)\.eqiad\.wmnet/ {
include role::coredb::s3
}
-node /db10(04|11|20|38)\.eqiad\.wmnet/ {
+node /^db10(04|11|20|38)\.eqiad\.wmnet/ {
include role::coredb::s4
}
-node /db10(05|21|26|39)\.eqiad\.wmnet/ {
+node /^db10(05|21|26|39)\.eqiad\.wmnet/ {
if $hostname =~ /^db1021/ {
$ganglia_aggregator = "true"
}
@@ -512,21 +512,21 @@
include role::coredb::s5
}
-node /db10(06|22|27|40)\.eqiad\.wmnet/ {
+node /^db10(06|22|27|40)\.eqiad\.wmnet/ {
include role::coredb::s6
}
-node /db10(07|24|28|41)\.eqiad\.wmnet/ {
+node /^db10(07|24|28|41)\.eqiad\.wmnet/ {
include role::coredb::s7
}
## x1 shard
-node /db10(29|30|31)\.eqiad\.wmnet/ {
+node /^db10(29|30|31)\.eqiad\.wmnet/ {
include role::coredb::x1
}
## m2 shard
-node /db104[68]\.eqiad\.wmnet/ {
+node /^db104[68]\.eqiad\.wmnet/ {
include role::coredb::m2
}
@@ -545,12 +545,12 @@
}
## researchdb
-node /db1047\.eqiad\.wmnet/ {
+node /^db1047\.eqiad\.wmnet/ {
class { role::coredb::researchdb : mariadb => true,
innodb_file_per_table => true }
}
## not currently in production and/or hardware issues
-node /db10(1[23456]|2[3]|3[2367]|4[45])\.eqiad\.wmnet/ {
+node /^db10(1[23456]|2[3]|3[2367]|4[45])\.eqiad\.wmnet/ {
include standard
}
--
To view, visit https://gerrit.wikimedia.org/r/53782
To unsubscribe, visit https://gerrit.wikimedia.org/r
[MediaWiki-commits] [Gerrit] s@node /db@node /^db@g - change (operations/puppet)
Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53782
Change subject: s@node /db@node /^db@g
..
s@node /db@node /^db@g
Change-Id: Ib5dd2b1e787556a1b3d46e4316cc7477ad2e6aba
---
M manifests/site.pp
1 file changed, 23 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/82/53782/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 56f8118..e7836ba 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -340,7 +340,7 @@
}
# pmtpa dbs
-node /db(32|59|60|63|69|71)\.pmtpa\.wmnet/ {
+node /^db(32|59|60|63|69|71)\.pmtpa\.wmnet/ {
if $hostname == "db59" {
class { role::coredb::s1 : mariadb => true }
} elsif $hostname == "db71"{
@@ -350,7 +350,7 @@
}
}
-node /db(52|53|54|57)\.pmtpa\.wmnet/ {
+node /^db(52|53|54|57)\.pmtpa\.wmnet/ {
if $hostname == "db52" {
class { role::coredb::s2 : mariadb => true }
} elsif $hostname == "db57"{
@@ -360,7 +360,7 @@
}
}
-node /db(34|39|64|66)\.pmtpa\.wmnet/ {
+node /^db(34|39|64|66)\.pmtpa\.wmnet/ {
if $hostname == "db39" {
class { role::coredb::s3 : mariadb => true }
} elsif $hostname == "db66"{
@@ -370,7 +370,7 @@
}
}
-node /db(31|33|51|65)\.pmtpa\.wmnet/ {
+node /^db(31|33|51|65)\.pmtpa\.wmnet/ {
if $hostname =~ /^db51/ {
$ganglia_aggregator = "true"
}
@@ -383,7 +383,7 @@
}
}
-node /db(35|44|45|55)\.pmtpa\.wmnet/ {
+node /^db(35|44|45|55)\.pmtpa\.wmnet/ {
if $hostname == "db35" {
class { role::coredb::s5 : mariadb => true }
} elsif $hostname == "db55"{
@@ -393,7 +393,7 @@
}
}
-node /db(43|46|47|50)\.pmtpa\.wmnet/ {
+node /^db(43|46|47|50)\.pmtpa\.wmnet/ {
if $hostname =~ /^db50/ {
$ganglia_aggregator = "true"
}
@@ -406,7 +406,7 @@
}
}
-node /db(37|56|58|68)\.pmtpa\.wmnet/ {
+node /^db(37|56|58|68)\.pmtpa\.wmnet/ {
if $hostname == "db58" {
class { role::coredb::s7 : mariadb => true }
} elsif $hostname == "db68"{
@@ -417,7 +417,7 @@
}
## x1 shard
-node /db(36|38)\.pmtpa\.wmnet/ {
+node /^db(36|38)\.pmtpa\.wmnet/ {
include role::coredb::x1
}
@@ -435,7 +435,7 @@
}
## m2 shard
-node /db4[89]\.pmtpa\.wmnet/ {
+node /^db4[89]\.pmtpa\.wmnet/ {
include role::coredb::m2
}
@@ -445,12 +445,12 @@
}
## researchdb
-node /db67\.pmtpa\.wmnet/ {
+node /^db67\.pmtpa\.wmnet/ {
include role::coredb::researchdb
}
## pgehres special project
-node /db29\.pmtpa\.wmnet/{
+node /^db29\.pmtpa\.wmnet/{
$gid = 500
system_role { "role::admin_tools_sul_audit_db": description => "Admin
Tools/SUL Audit database" }
include base,
@@ -470,12 +470,12 @@
## not in use for various reasons
-node /db(42|6[12]|7[1-7])\.pmtpa\.wmnet/{
+node /^db(42|6[12]|7[1-7])\.pmtpa\.wmnet/{
include standard
}
# eqiad dbs
-node /db10(01|17|42|43|49|50)\.eqiad\.wmnet/ {
+node /^db10(01|17|42|43|49|50)\.eqiad\.wmnet/ {
if $hostname =~ /^db10(01|17)/ {
$ganglia_aggregator = "true"
include mha::manager
@@ -488,7 +488,7 @@
}
}
-node /db10(02|09|18|34)\.eqiad\.wmnet/ {
+node /^db10(02|09|18|34)\.eqiad\.wmnet/ {
if $hostname == "db1009" {
class { role::coredb::s2 : mariadb => true }
} else {
@@ -496,15 +496,15 @@
}
}
-node /db10(03|10|19|35)\.eqiad\.wmnet/ {
+node /^db10(03|10|19|35)\.eqiad\.wmnet/ {
include role::coredb::s3
}
-node /db10(04|11|20|38)\.eqiad\.wmnet/ {
+node /^db10(04|11|20|38)\.eqiad\.wmnet/ {
include role::coredb::s4
}
-node /db10(05|21|26|39)\.eqiad\.wmnet/ {
+node /^db10(05|21|26|39)\.eqiad\.wmnet/ {
if $hostname =~ /^db1021/ {
$ganglia_aggregator = "true"
}
@@ -512,21 +512,21 @@
include role::coredb::s5
}
-node /db10(06|22|27|40)\.eqiad\.wmnet/ {
+node /^db10(06|22|27|40)\.eqiad\.wmnet/ {
include role::coredb::s6
}
-node /db10(07|24|28|41)\.eqiad\.wmnet/ {
+node /^db10(07|24|28|41)\.eqiad\.wmnet/ {
include role::coredb::s7
}
## x1 shard
-node /db10(29|30|31)\.eqiad\.wmnet/ {
+node /^db10(29|30|31)\.eqiad\.wmnet/ {
include role::coredb::x1
}
## m2 shard
-node /db104[68]\.eqiad\.wmnet/ {
+node /^db104[68]\.eqiad\.wmnet/ {
include role::coredb::m2
}
@@ -545,12 +545,12 @@
}
## researchdb
-node /db1047\.eqiad\.wmnet/ {
+node /^db1047\.eqiad\.wmnet/ {
class { role::coredb::researchdb : mariadb => true,
innodb_file_per_table => true }
}
## not currently in production and/or hardware issues
-node /db10(1[23456]|2[3]|3[2367]|4[45])\.eqiad\.wmnet/ {
+node /^db10(1[23456]|2[3]|3[2367]|4[45])\.eqiad\.wmnet/ {
include standard
}
--
To view, visit https://gerrit.wikimedia.or
[MediaWiki-commits] [Gerrit] db1009 -> mariadb, max_cons -> 1000 - change (operations/puppet)
Asher has submitted this change and it was merged.
Change subject: db1009 -> mariadb, max_cons -> 1000
..
db1009 -> mariadb, max_cons -> 1000
Change-Id: Id0752ddb985dd9367d291b63347c6b6aa7333f3c
---
M manifests/site.pp
M modules/coredb_mysql/templates/prod.my.cnf.erb
2 files changed, 6 insertions(+), 2 deletions(-)
Approvals:
Asher: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 405e7d2..56f8118 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -489,7 +489,11 @@
}
node /db10(02|09|18|34)\.eqiad\.wmnet/ {
- include role::coredb::s2
+ if $hostname == "db1009" {
+ class { role::coredb::s2 : mariadb => true }
+ } else {
+ include role::coredb::s2
+ }
}
node /db10(03|10|19|35)\.eqiad\.wmnet/ {
diff --git a/modules/coredb_mysql/templates/prod.my.cnf.erb
b/modules/coredb_mysql/templates/prod.my.cnf.erb
index 8a80067..eac9705 100644
--- a/modules/coredb_mysql/templates/prod.my.cnf.erb
+++ b/modules/coredb_mysql/templates/prod.my.cnf.erb
@@ -35,7 +35,7 @@
thread_stack = 192K
thread_cache_size = 300
-max_connections= 5000
+max_connections= 1000
table_open_cache= 5
table_definition_cache = 4
--
To view, visit https://gerrit.wikimedia.org/r/53767
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id0752ddb985dd9367d291b63347c6b6aa7333f3c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
Gerrit-Reviewer: Asher
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] db1009 -> mariadb, max_cons -> 1000 - change (operations/puppet)
Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53767
Change subject: db1009 -> mariadb, max_cons -> 1000
..
db1009 -> mariadb, max_cons -> 1000
Change-Id: Id0752ddb985dd9367d291b63347c6b6aa7333f3c
---
M manifests/site.pp
M modules/coredb_mysql/templates/prod.my.cnf.erb
2 files changed, 6 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/67/53767/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 405e7d2..56f8118 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -489,7 +489,11 @@
}
node /db10(02|09|18|34)\.eqiad\.wmnet/ {
- include role::coredb::s2
+ if $hostname == "db1009" {
+ class { role::coredb::s2 : mariadb => true }
+ } else {
+ include role::coredb::s2
+ }
}
node /db10(03|10|19|35)\.eqiad\.wmnet/ {
diff --git a/modules/coredb_mysql/templates/prod.my.cnf.erb
b/modules/coredb_mysql/templates/prod.my.cnf.erb
index 8a80067..eac9705 100644
--- a/modules/coredb_mysql/templates/prod.my.cnf.erb
+++ b/modules/coredb_mysql/templates/prod.my.cnf.erb
@@ -35,7 +35,7 @@
thread_stack = 192K
thread_cache_size = 300
-max_connections= 5000
+max_connections= 1000
table_open_cache= 5
table_definition_cache = 4
--
To view, visit https://gerrit.wikimedia.org/r/53767
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0752ddb985dd9367d291b63347c6b6aa7333f3c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pulling db1009 for upgrade - change (operations/mediawiki-config)
Asher has submitted this change and it was merged. Change subject: pulling db1009 for upgrade .. pulling db1009 for upgrade Change-Id: I4855deb9606b3afac4decae60842b9fed83f5174 --- M wmf-config/db-eqiad.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Asher: Verified; Looks good to me, approved diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 179eaa4..8c4a85f 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -90,7 +90,7 @@ 's2' => array( 'db1034'=> 0, 'db1002'=> 400, - 'db1009'=> 400, + #'db1009'=> 400, 'db1018'=> 100, # snaphsot ), /* s3 */ 'DEFAULT' => array( -- To view, visit https://gerrit.wikimedia.org/r/53766 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4855deb9606b3afac4decae60842b9fed83f5174 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher Gerrit-Reviewer: Asher Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pulling db1009 for upgrade - change (operations/mediawiki-config)
Asher has uploaded a new change for review. https://gerrit.wikimedia.org/r/53766 Change subject: pulling db1009 for upgrade .. pulling db1009 for upgrade Change-Id: I4855deb9606b3afac4decae60842b9fed83f5174 --- 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/53766/1 diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 179eaa4..8c4a85f 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -90,7 +90,7 @@ 's2' => array( 'db1034'=> 0, 'db1002'=> 400, - 'db1009'=> 400, + #'db1009'=> 400, 'db1018'=> 100, # snaphsot ), /* s3 */ 'DEFAULT' => array( -- To view, visit https://gerrit.wikimedia.org/r/53766 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4855deb9606b3afac4decae60842b9fed83f5174 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pmtpa side of extension1 shard - change (operations/mediawiki-config)
Asher has submitted this change and it was merged. Change subject: pmtpa side of extension1 shard .. pmtpa side of extension1 shard Change-Id: If76b19aed8068caf776259dc14baaa75a3fdd5c4 --- M wmf-config/db-pmtpa.php 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Asher: Verified; Looks good to me, approved diff --git a/wmf-config/db-pmtpa.php b/wmf-config/db-pmtpa.php index 3080529..ec789f4 100644 --- a/wmf-config/db-pmtpa.php +++ b/wmf-config/db-pmtpa.php @@ -287,9 +287,9 @@ # ExtensionStore shard1 - initially for AFTv5 # TODO: pmtpa replica of the shard, currently only in eqiad 'extension1' => array( - '10.64.16.18' => 10, # db1029 - '10.64.16.19' => 100, # db1030 - '10.64.16.20' => 40, # db1031 snapshot host + '10.64.16.18' => 0, # db1029 + '10.0.6.48' => 1, # db38 + '10.0.6.46' => 1, # db36 ), ), -- To view, visit https://gerrit.wikimedia.org/r/53269 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If76b19aed8068caf776259dc14baaa75a3fdd5c4 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher Gerrit-Reviewer: Asher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pmtpa side of extension1 shard - change (operations/mediawiki-config)
Asher has uploaded a new change for review. https://gerrit.wikimedia.org/r/53269 Change subject: pmtpa side of extension1 shard .. pmtpa side of extension1 shard Change-Id: If76b19aed8068caf776259dc14baaa75a3fdd5c4 --- M wmf-config/db-pmtpa.php 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/69/53269/1 diff --git a/wmf-config/db-pmtpa.php b/wmf-config/db-pmtpa.php index 3080529..ec789f4 100644 --- a/wmf-config/db-pmtpa.php +++ b/wmf-config/db-pmtpa.php @@ -287,9 +287,9 @@ # ExtensionStore shard1 - initially for AFTv5 # TODO: pmtpa replica of the shard, currently only in eqiad 'extension1' => array( - '10.64.16.18' => 10, # db1029 - '10.64.16.19' => 100, # db1030 - '10.64.16.20' => 40, # db1031 snapshot host + '10.64.16.18' => 0, # db1029 + '10.0.6.48' => 1, # db38 + '10.0.6.46' => 1, # db36 ), ), -- To view, visit https://gerrit.wikimedia.org/r/53269 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If76b19aed8068caf776259dc14baaa75a3fdd5c4 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
