Reedy has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/366837 )
Change subject: Fix up some file indenting broken by my phpcs changes
......................................................................
Fix up some file indenting broken by my phpcs changes
Bug: T171282
Change-Id: I0152a03cc3ef8c0f86b309555e46e8073c185fa1
---
M wmf-config/StartProfiler.php
M wmf-config/db-eqiad.php
2 files changed, 24 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/37/366837/1
diff --git a/wmf-config/StartProfiler.php b/wmf-config/StartProfiler.php
index d104454..26e69d0 100644
--- a/wmf-config/StartProfiler.php
+++ b/wmf-config/StartProfiler.php
@@ -61,14 +61,16 @@
} else {
// 1:1000 request profiling
- // $wgProfiler = array(
- // 'class' => 'ProfilerXhprof',
- // 'exclude' => array( 'section.*', 'run_init*' ),
- // 'flags' => ( XHPROF_FLAGS_CPU | XHPROF_FLAGS_MEMORY |
XHPROF_FLAGS_NO_BUILTINS ),
- // 'output' => 'stats',
- // 'prefix' => 'xhprof',
- // 'sampling' => 10000,
- // );
+ /*
+ $wgProfiler = array(
+ 'class' => 'ProfilerXhprof',
+ 'exclude' => array( 'section.*', 'run_init*' ),
+ 'flags' => ( XHPROF_FLAGS_CPU | XHPROF_FLAGS_MEMORY
| XHPROF_FLAGS_NO_BUILTINS ),
+ 'output' => 'stats',
+ 'prefix' => 'xhprof',
+ 'sampling' => 10000,
+ );
+ */
}
}
diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 07ba4dc..c3dc19c 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -118,9 +118,9 @@
/* s3 */ 'DEFAULT' => [
'db1075' => 0, # A2 3.6TB 512GB, master
'db1038' => 0, # B2 1.4TB 64GB, vslow, dump, old master
-# 'db1015' => 1, # A2 1.4TB 64GB, do not pool, it is missing cebwiki
+ # 'db1015' => 1, # A2 1.4TB 64GB, do not pool, it is missing
cebwiki
'db1035' => 50, # B2 1.4TB 64GB, watchlist, recentchanges,
contributions, logpager
-# 'db1044' => 0, # B2 1.4TB 64GB, #Temporary master for db1095 - new
sanitarium #T150802
+ # 'db1044' => 0, # B2 1.4TB 64GB, #Temporary master for
db1095 - new sanitarium #T150802
'db1077' => 500, # B1 3.6TB 512GB
'db1078' => 500, # C3 3.6TB 512GB
],
@@ -148,7 +148,7 @@
],
's6' => [
'db1061' => 0, # C3 2.8TB 128GB, master
-# 'db1050' => 0, # B2 2.8TB 64GB, old master2
+ # 'db1050' => 0, # B2 2.8TB 64GB, old master2
'db1030' => 0, # B1 1.4TB 64GB, vslow, dump
'db1037' => 1, # B2 1.4TB 64GB, watchlist, recentchanges,
contributions, logpager
'db1085' => 300, # B3 3.6TB 512GB, api #master for db1102
(sanitarium 3) - T153743
@@ -157,11 +157,11 @@
],
's7' => [
'db1062' => 0, # D4 2.8TB 128GB, master
-# 'db1041' => 0, # B2 1.4TB 64GB, old master2
-# 'db1033' => 0, # B2 1.4TB 64GB, old master
+ # 'db1041' => 0, # B2 1.4TB 64GB, old master2
+ # 'db1033' => 0, # B2 1.4TB 64GB, old master
'db1028' => 0, # B1 1.4TB 64GB, vslow, dump
'db1034' => 1, # B2 1.4TB 64GB, watchlist, recentchanges,
contributions, logpager
-# 'db1039' => 0, # B2 1.4TB 64GB
+ # 'db1039' => 0, # B2 1.4TB 64GB
'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102
(sanitarium 3)
'db1086' => 500, # B3 3.6TB 512GB, api
'db1094' => 500, # D2 3.6TB 512GB
@@ -582,7 +582,7 @@
'db2072' => '10.192.16.37', # do not remove or comment out
'virt1000' => '208.80.154.18', # do not remove or comment out
'silver' => '208.80.154.136', # do not remove or comment out
- 'labtestweb2001' => '208.80.153.14', # do not remove or comment
out
+ 'labtestweb2001' => '208.80.153.14', # do not remove or comment out
],
'externalLoads' => [
@@ -656,13 +656,13 @@
# This key must exist for the master switch script to work
'readOnlyBySection' => [
-# 's1' => 'This wiki is in read-only mode for a datacenter switchover
test. See https://meta.wikimedia.org/wiki/codfw for more information.',
-# 's2' => 'This wiki is in read-only mode for a datacenter switchover
test. See https://meta.wikimedia.org/wiki/codfw for more information.',
-# 'DEFAULT' => 'This wiki is in read-only mode for a datacenter switchover
test. See https://meta.wikimedia.org/wiki/codfw for more information.', # s3
-# 's4' => 'This wiki is in read-only mode for a datacenter switchover
test. See https://meta.wikimedia.org/wiki/codfw for more information.',
-# 's5' => 'This wiki is in read-only mode for a datacenter switchover
test. See https://meta.wikimedia.org/wiki/codfw for more information.',
-# 's6' => 'This wiki is in read-only mode for a datacenter switchover
test. See https://meta.wikimedia.org/wiki/codfw for more information.',
-# 's7' => 'This wiki is in read-only mode for a datacenter switchover
test. See https://meta.wikimedia.org/wiki/codfw for more information.',
+ # 's1' => 'This wiki is in read-only mode for a datacenter
switchover test. See https://meta.wikimedia.org/wiki/codfw for more
information.',
+ # 's2' => 'This wiki is in read-only mode for a datacenter
switchover test. See https://meta.wikimedia.org/wiki/codfw for more
information.',
+ # 'DEFAULT' => 'This wiki is in read-only mode for a datacenter
switchover test. See https://meta.wikimedia.org/wiki/codfw for more
information.', # s3
+ # 's4' => 'This wiki is in read-only mode for a datacenter
switchover test. See https://meta.wikimedia.org/wiki/codfw for more
information.',
+ # 's5' => 'This wiki is in read-only mode for a datacenter
switchover test. See https://meta.wikimedia.org/wiki/codfw for more
information.',
+ # 's6' => 'This wiki is in read-only mode for a datacenter
switchover test. See https://meta.wikimedia.org/wiki/codfw for more
information.',
+ # 's7' => 'This wiki is in read-only mode for a datacenter
switchover test. See https://meta.wikimedia.org/wiki/codfw for more
information.',
],
];
--
To view, visit https://gerrit.wikimedia.org/r/366837
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0152a03cc3ef8c0f86b309555e46e8073c185fa1
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
