Giuseppe Lavagetto has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/351592 )
Change subject: Switch back to eqiad ...................................................................... Switch back to eqiad The single files in this commit will be synced at different phases of the switchdc procedure. More details at https://wikitech.wikimedia.org/wiki/Switch_Datacenter#MediaWiki Change-Id: I046f201936a3cc28fe8dc933b1e9c3f9d5e05ba3 --- M wmf-config/CommonSettings.php M wmf-config/db-codfw.php M wmf-config/db-eqiad.php 3 files changed, 15 insertions(+), 15 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved Marostegui: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 86ddc58..54132e6 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -104,7 +104,7 @@ # Get configuration from etcd. This gives us the correct $wmfMasterDatacenter require "$wmfConfigDir/etcd.php"; } else { - $wmfMasterDatacenter = 'codfw'; + $wmfMasterDatacenter = 'eqiad'; } $wmfMasterServices = $wmfAllServices[$wmfMasterDatacenter]; diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index 7d5a542..37f2df7 100644 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -643,13 +643,13 @@ # to prevent accidental write to eqiad from codfw, # when the master dc is eqiad. '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.', ], ]; diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php index 9af3a5c..99f30a0 100644 --- a/wmf-config/db-eqiad.php +++ b/wmf-config/db-eqiad.php @@ -663,13 +663,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/351592 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I046f201936a3cc28fe8dc933b1e9c3f9d5e05ba3 Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Giuseppe Lavagetto <[email protected]> Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]> Gerrit-Reviewer: Jcrespo <[email protected]> Gerrit-Reviewer: Marostegui <[email protected]> Gerrit-Reviewer: Volans <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
