[21:59:20] <Pchelolo>	 TimStarling: is there anything you still want to do on https://gerrit.wikimedia.org/r/c/mediawiki/core/+/684142 ? I kinda wanna merge it
[22:00:30] <Pchelolo>	 is there anything that's blocking it going in?
[22:05:25] <TimStarling>	 nothing blocking it -- I'll rebase it
[22:06:55] <Pchelolo>	 cool. the mw-config folowup needs merging too right? but we deploy mw-config right away, so I can merge now if you deploy, or I can merge and deploy tomorrow my morning
[22:09:34] <TimStarling>	 just give +1 on the config change
[22:10:22] <TimStarling>	 it's not urgent -- it only needs to be merged before InitialiseSettings.php is changed to reference the new constants
[22:11:03] <Pchelolo>	 oki. in return I would like to get review on this incredibly complex patch https://gerrit.wikimedia.org/r/c/mediawiki/extensions/CentralAuth/+/704427/
[22:11:34] <Pchelolo>	 it's amusing how complex it is  :) 
[22:12:20] <Pchelolo>	 thank you
[22:41:15] <Pchelolo>	 TimStarling: would you mind also to have a look at https://gerrit.wikimedia.org/r/c/mediawiki/core/+/701276 - I think it should be a safe change, but I'm not sure if I'm missing something. I don't think we can find issues with it by eyeballing it, but maybe something obvious jumps at you
[23:24:17] <Reedy>	 >UnexpectedValueException from line 1290 of /srv/mediawiki-staging/php-master/includes/ServiceWiring.php: The MultiContentRevisionSchemaMigrationStage setting is no longer supported!\n#0 /srv/mediawiki-staging/php-master/vendor/wikimedia/services/src/ServiceContainer.php(447): Wikimedia\\Services\\ServiceContainer::{closure}(Object(MediaWiki\\MediaWikiServices))
[23:25:21] <Reedy>	 TimStarling: Pchelolo: Does beta need a config patch?
[23:26:28] <Pchelolo>	 one sec, lemme see
[23:26:59] <Reedy>	 full stack on https://integration.wikimedia.org/ci/job/beta-scap-sync-world/12931/console
[23:28:51] <Pchelolo>	 Reedy: https://gerrit.wikimedia.org/r/c/operations/mediawiki-config/+/701467
[23:29:26] <TimStarling>	 I guess it is needed after all
[23:29:30] <Pchelolo>	 we thought we'd only need this when actually starting to use the new constants in initialize settings, but seems like we need them earlier for some reason
[23:29:52] <TimStarling>	 I didn't review everything in CI, only the scripts that use it in mediawiki-config
[23:30:23] <TimStarling>	 does this also affect production?
[23:31:12] <Reedy>	 I don't think so. Not until next weeks train rolls out at least
[23:31:29] <Reedy>	 whereas beta updated itself to HEAD of master
[23:32:31] <TimStarling>	 my guess is it is actually the config cache
[23:32:49] <Pchelolo>	 the code that failing is if ( $config->get( 'MultiContentRevisionSchemaMigrationStage' ) !== SCHEMA_COMPAT_NEW ) { throw
[23:33:05] <Pchelolo>	 and DEfaultSettings is $wgMultiContentRevisionSchemaMigrationStage = SCHEMA_COMPAT_NEW
[23:33:08] <TimStarling>	 yeah, but I don't think it is using src/defines.php in that code path
[23:33:29] <TimStarling>	 there is a cache of InitialiseSettings.php which is invalidated when InitialiseSettings.php changes its mtime
[23:34:00] <TimStarling>	 my guess is that it will be enough to just touch InitialiseSettings.php
[23:34:52] <TimStarling>	 I'll try running this script manually
[23:36:31] <Reedy>	 https://integration.wikimedia.org/ci/job/beta-update-databases-eqiad/51796/console it failed on update.php
[23:36:33] <Reedy>	 too
[23:38:00] <TimStarling>	 my ssh config is out of date, everything is still wmflabs
[23:41:54] <TimStarling>	 eqiad1? there are multiple eqiads now?
[23:42:58] <Reedy>	 I think it was naming used/introduced during an openstack upgrade
[23:46:39] <Reedy>	 deployment-deploy01.eqiad.wmflabs should work fine
[23:46:56] <TimStarling>	 $confActualMtime = max(
[23:46:56] <TimStarling>	 	filemtime( "$wmfConfigDir/InitialiseSettings.php" ),
[23:46:56] <TimStarling>	 	filemtime( "$wmfConfigDir/logos.php" )
[23:46:56] <TimStarling>	 );
[23:47:49] <TimStarling>	 we can probably throw Defines.php in there
[23:50:12] <TimStarling>	 www-data@deployment-deploy01:/srv/mediawiki-staging$ ls -l /tmp/mw-cache-master/conf2-aawiki.json wmf-config/InitialiseSettings.php php-master/includes/Defines.php
[23:50:12] <TimStarling>	 -rw-r--r-- 1 jenkins-deploy wikidev   11137 Jul 13 23:13 php-master/includes/Defines.php
[23:50:12] <TimStarling>	 -rw------- 1 www-data       www-data 128397 Jul 13 22:24 /tmp/mw-cache-master/conf2-aawiki.json
[23:50:12] <TimStarling>	 -rw-rw-r-- 1 jenkins-deploy wikidev  821643 Jul 13 22:21 wmf-config/InitialiseSettings.php
[23:50:43] <TimStarling>	 note timestamps -- Defines.php is the newest
[23:52:48] <TimStarling>	 no bug number I assume
[23:53:21] <Reedy>	 I didn't file one, no
[23:56:01] <TimStarling>	 https://gerrit.wikimedia.org/r/c/operations/mediawiki-config/+/704444