[00:00:24] gerrit wont let me +2 hahaa [00:00:26] come onn [00:00:53] (CR) jerkins-bot: [V: -1] Attempt to unravel pre-create [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/684537 (owner: Eileen) [00:01:33] awwww [00:01:41] ehhh thanks also!! [00:01:42] (CR) Cstone: [C: +2] "This looks good! Updates the contact, logs (both when there are messages on the queue and when there are none). I got a bad message onto t" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/682349 (https://phabricator.wikimedia.org/T268511) (owner: Eileen) [00:01:48] yayyyy [00:01:52] haha went to other computer [00:02:48] woohooo glad that worked heheh :) :) [00:04:32] (CR) jerkins-bot: [V: -1] E-mail pref ctr queue consumer using api [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/682349 (https://phabricator.wikimedia.org/T268511) (owner: Eileen) [00:07:40] RECOVERY - check_log_messages on frav1002 is OK: OK [00:18:03] (CR) AndyRussG: "recheck" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/682349 (https://phabricator.wikimedia.org/T268511) (owner: Eileen) [00:18:15] (PS5) Eileen: Attempt to unravel pre-create [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/684537 [00:21:51] (CR) jerkins-bot: [V: -1] Attempt to unravel pre-create [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/684537 (owner: Eileen) [00:24:59] (PS6) Eileen: Attempt to unravel pre-create [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/684537 [00:28:21] (CR) jerkins-bot: [V: -1] Attempt to unravel pre-create [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/684537 (owner: Eileen) [00:29:55] (PS7) Eileen: Attempt to unravel pre-create [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/684537 [00:33:31] (CR) jerkins-bot: [V: -1] Attempt to unravel pre-create [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/684537 (owner: Eileen) [00:42:57] (PS8) Eileen: Attempt to unravel pre-create [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/684537 [00:43:13] cstone: it didn't merge :| [00:46:28] (CR) jerkins-bot: [V: -1] Attempt to unravel pre-create [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/684537 (owner: Eileen) [00:48:21] AndyRussG: I'm close to getting that precreate stuff fixed - it's falling over on the grant line now which is much later [00:50:43] eileen: ah okok cool! I haven't looked at it yet, but I could in about 1 hr [00:53:18] eileen: ah oops looks like for this same reason, the e-mail pref queue consumer is not merging! [00:53:20] https://paste.toolforge.org/view/47c2b576 [00:53:46] (PS9) Eileen: Attempt to unravel pre-create [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/684537 [00:53:48] https://integration.wikimedia.org/ci/job/wikimedia-fundraising-civicrm-docker/5105/console [00:55:16] (PS1) Eileen: Do not attempt to set grant permissions [wikimedia/fundraising/crm/civicrm-buildkit] - https://gerrit.wikimedia.org/r/684568 (https://phabricator.wikimedia.org/T281609) [00:55:36] AndyRussG: yeah - because I don't think updating buildkit triggers Ci so it wasn't obvious the changes broke it [00:56:13] I think if we roll back the grant permission line for now I can get the rest through - ie with 684568 merged I think 684537 will merge [00:58:24] Fundraising-Backlog, FR-Docker, Patch-For-Review: Docker dev setup: fix fredge database setup - https://phabricator.wikimedia.org/T281609 (Eileenmcnaughton) Just noting that this broke CI because of the weird mysql precreated stuff - I think if we can get this through then we can whack this mole dead... [01:10:51] Fundraising-Backlog, FR-Docker, Patch-For-Review: Docker dev setup: fix fredge database setup - https://phabricator.wikimedia.org/T281609 (Eileenmcnaughton) I've logged this upstream https://github.com/amp-cli/amp/issues/67 to see the response to making db names specifiable (the reason we currently p... [01:19:15] eileen: I can +2 this one https://gerrit.wikimedia.org/r/c/wikimedia/fundraising/crm/civicrm-buildkit/+/684568/ [01:19:23] (removes the grant permissions line) [01:20:12] eileen: I guess you also saw this one? [01:20:14] https://gerrit.wikimedia.org/r/c/wikimedia/fundraising/crm/civicrm-buildkit/+/684138 [01:20:32] Now recalling, the current master of buildkit was also failing locally if the db already existed [01:20:43] so that other patch drops the whole database too [01:20:49] I guess that doesn't help tho? [01:21:30] anyway happy to +2 and merge the removal of the gran permissions line... [01:21:33] AndyRussG: well not with the CI problem [01:21:54] If you +2 the one you marked I can see if that will fix the CI problem [01:22:26] the problem with this line [01:22:26] echo "GRANT ALL ON fredge.* TO 'drupal'@'%'"| amp sql -N civi -a [01:22:36] is that on ci the user is not called 'drupal' [01:22:50] ahhhh hmmm ok gotcha [01:22:51] - but we can come back to that if we get CI working & unblocking [01:23:04] K fun times heheheh [01:23:28] yeah -but maybe this time we will get a more durable fix [01:23:53] (CR) AndyRussG: [C: +2] Do not attempt to set grant permissions [wikimedia/fundraising/crm/civicrm-buildkit] - https://gerrit.wikimedia.org/r/684568 (https://phabricator.wikimedia.org/T281609) (owner: Eileen) [01:23:56] (CR) AndyRussG: [V: +2 C: +2] Do not attempt to set grant permissions [wikimedia/fundraising/crm/civicrm-buildkit] - https://gerrit.wikimedia.org/r/684568 (https://phabricator.wikimedia.org/T281609) (owner: Eileen) [01:25:14] (PS10) Eileen: Attempt to unravel pre-create [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/684537 (https://phabricator.wikimedia.org/T281609) [01:25:53] ok - retrying [01:30:39] (CR) AndyRussG: "recheck" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/682349 (https://phabricator.wikimedia.org/T268511) (owner: Eileen) [01:32:11] (CR) jerkins-bot: [V: -1] Attempt to unravel pre-create [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/684537 (https://phabricator.wikimedia.org/T281609) (owner: Eileen) [01:32:50] dang CI failing on the permissions [01:36:46] eileen: hmm also this one dying as before: [01:36:48] 20:32:57 +++ echo 'CREATE DATABASE IF NOT EXISTS fredge' [01:36:50] 20:32:57 +++ amp sql -N civi -a [01:36:52] 20:32:57 [01:36:54] 20:32:57 Fatal error: Uncaught Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException: Circular reference detected for service "db.mysql_precreated", path: "db.mysql_precreated -> instances". in phar:///src/wikimedia/fundraising/crm/civicrm-buildkit/bin/amp/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Container.php:296 [01:37:02] (the email pref ctr api one) [01:37:20] eileen: we should probably abandon the rabbi thole pretty soon....? [01:39:51] AndyRussG: we could maybe look up the user name in mysql ? [01:41:42] the mysql docs suggest this should work but it doesn't GRANT ALL ON civicrm.* TO ''@'localhost' [01:43:41] (CR) DannyS712: [C: +2] build: Updating composer dependencies [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/684586 (owner: Libraryupgrader) [01:46:43] eileen: I suggest just reverting the whole create fredge db thing for now, and for fr-dev just making that run in setup.sh [01:47:07] I think the progress made by you and e jegg on fixing the db stuff is great [01:47:16] and isn't work that'd be lost if we do that [01:47:20] Hmm - I think there is a different part we can revert & go back to not having a separate db on fredge [01:47:24] on dev [01:47:47] or a for now anyway [01:48:12] hmmm dunno, I think we do want the db setup to be as similar as possible? that's why E lliott dug into it I think? i don't know the implications [01:48:24] but I also don't imagine it's a blocker for now to do it like you say, either [01:52:02] (PS1) Eileen: Use drupal db for fredge [wikimedia/fundraising/crm/civicrm-buildkit] - https://gerrit.wikimedia.org/r/684600 (https://phabricator.wikimedia.org/T281609) [01:52:28] AndyRussG: yeah - we can switch back later - but ^^ should get us back to CI working [01:52:52] & we should be in a better place to re-solve it later because we are down to just one problem with it [01:56:01] eileen: I don't understand that one [01:56:09] install.sh will still create the db then? [01:56:25] shouldn't we just revert there instead? or at least, also? [01:56:41] yeah - we can still create there because the goal is to re-instate that working [01:57:07] & by leaving it there we lock in the things that stop us breaking that part again [01:58:05] But that bit of code tells it to use the same db for fredge so we won't have permissions issues [02:00:24] eileen: ok [02:00:32] what we want is to make sure that the parts of the puzzle we do solve are the same for CI & local dev environments & we managed to get the create part solved for both (finally) I think - we need to confirm once that one is merged [02:00:59] eileen: you saw on the ci for the e-p-c queue consumer it was complaining about some symfony circular dependency, right? [02:01:13] I guess you're understanding that as a side effect and not the real error? [02:01:14] AndyRussG: yep - that is the precreate db stuff [02:01:27] ok [02:02:04] do you want to merge the "Use drupal db for fredge" patch (https://gerrit.wikimedia.org/r/684600) or should I test it first somewhere? [02:02:12] *merge blindly [02:02:30] lol - you can merge blindly since CI will spit the dummy if it fails :-) [02:03:20] okok yis [02:03:56] (CR) AndyRussG: [C: +2] "aaahhhhhhh" [wikimedia/fundraising/crm/civicrm-buildkit] - https://gerrit.wikimedia.org/r/684600 (https://phabricator.wikimedia.org/T281609) (owner: Eileen) [02:04:02] (CR) AndyRussG: [V: +2 C: +2] Use drupal db for fredge [wikimedia/fundraising/crm/civicrm-buildkit] - https://gerrit.wikimedia.org/r/684600 (https://phabricator.wikimedia.org/T281609) (owner: Eileen) [02:04:33] (CR) AndyRussG: "recheck" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/682349 (https://phabricator.wikimedia.org/T268511) (owner: Eileen) [02:04:38] K [02:04:38] AndyRussG: I just found this line in another file [02:04:38] GRANT ALL PRIVILEGES ON $CIVI_DB_NAME.* TO $CMS_DB_USER@'%'; [02:04:47] it might be those params are there [02:04:59] (CR) Eileen: "recheck" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/684537 (https://phabricator.wikimedia.org/T281609) (owner: Eileen) [02:05:06] I guess later I'll see later what happened to fr-dev [02:05:11] So your one won't pass without this https://gerrit.wikimedia.org/r/c/wikimedia/fundraising/crm/+/684537 [02:05:11] eileen: ah interesting! [02:05:19] so I'm doing re-check on that now [02:06:48] K I'm understanding that even less [02:07:13] those are files in the main crm repo that are only used by ci? [02:08:54] yep [02:09:16] & they are what causes the circular dependency when you tried to create fredge the other way [02:12:30] weird [02:12:56] so we're now un-creating fredge for CI and will use the drupal db like the buildkit patch I blindly merged says, I guess? [02:13:12] I see a bunch more stuff in that patch other than just not creating fredge? [02:13:38] eileen: if you think it'd be more efficient to fix this we could also talk it out on a call [02:14:18] hmm I'm still kinda digging in - but we can remove that create I guess because it's failed again so we are not quite there on it [02:15:39] K hmmm so that patch not ready for review? [02:17:24] (CR) Eileen: "recheck" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/684537 (https://phabricator.wikimedia.org/T281609) (owner: Eileen) [02:17:38] yeah so it's not picked up that last merged change [02:17:40] I guess [02:18:54] hmmm [02:27:13] eileen: K I'm here for whatever is needed for this, not going anywhere for the next 3-4 hours... I do think we should do whatever needed to merge the queue consumer this evening, if I may say so? does that sound reasonable? [02:28:21] AndyRussG: OK - I'm testing that it might be that if mysql -uroot picked up the hostname from my.cnf locally it might work on both local & jenkins [02:28:49] actually maybe we don't even need that [02:30:21] eileen: k no worries, also no rush, again I'm here all evening [02:31:02] today is one of the week's kidless days for me, so no need to get up early, and I'm not as tired as on the kidful days [02:31:11] also I ordered food, so I didn't even cook! [02:33:28] nice [02:33:47] I'm just testing that syntax I pasted above to see if it works [02:34:21] okok cool [02:40:05] (just gonna be afk for about 10 minutes now, so brb) [03:02:08] (back) [03:23:17] (PS1) Eileen: Revert "Use drupal db for fredge" and set permissions more better [wikimedia/fundraising/crm/civicrm-buildkit] - https://gerrit.wikimedia.org/r/684635 (https://phabricator.wikimedia.org/T281609) [03:23:26] AndyRussG: ^ is working for me locally [03:24:07] (PS1) Eileen: Update boilerplate code [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/684636 (https://phabricator.wikimedia.org/T281647) [03:24:52] Also ^^ is the immediate issue on the monolog one - ie the reason for the log effort I think - but I also have another exception catching patch on that that is more robust [03:24:58] (to do as well) [03:27:20] (CR) jerkins-bot: [V: -1] Update boilerplate code [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/684636 (https://phabricator.wikimedia.org/T281647) (owner: Eileen) [03:29:10] eileen: okok whee trying it out now eh [03:30:40] I'm confused at the eval and also why it's not the amp sql thing but I think my understanding of that is secondary heheh [03:34:09] AndyRussG: because copy & paste worked ..... [03:34:33] tbh the amp thing might work but I got copy & paste right & the amp thing wrong [03:35:32] eileen: works great eh! [03:35:37] fredge db created [03:35:46] and I didn't need to nuke the vendor directory [03:35:59] Yeah that vendor I still have more fixes on [03:36:11] it's not vendor I don't think - it's templates_c [03:36:19] monolog table is there [03:36:46] AndyRussG: I just attempted to log into this https://github.vmix.cc/eileenmcnaughton/au.org.greens.extendedmailingstats - do you think I got password harvested? [03:36:51] eileen: well this civi-drupal-buildkit machine is not one for simple solutions [03:36:59] :-) [03:37:39] eileen: yes, change your password asap [03:37:47] ok [03:38:42] and change the password on any other sites where you may use the same or very similar passwords [03:38:53] wow crazy stuff [03:41:17] yeah that's a crazy github clone phishing site [03:41:44] yeah creepy [03:42:10] if I had just gotten an ok-ish thing after entering it I wouldn't have realised [03:42:38] I think they actually briefly managed to reset my password! [03:42:46] eileen: oh no! [03:43:01] eileen: but you have it back now? [03:43:18] are you in the wmf group on GitHub? [03:43:18] yes I reset it [03:43:27] maybe - not sure [03:43:30] and the new one still works? [03:43:46] yeah so I think I failed to log in and then I reset it and the new one works [03:43:56] & there was 1 minute between events [03:44:05] actually I also got an email saying it had been reset [03:44:24] but the ip for the first reset is my own [03:44:32] so they did something browser-cunning [03:44:36] huh [03:44:51] oh right from your own browser! [03:44:53] wow [03:45:17] what is the email for security - I should advise [03:47:08] eileen: I think security-team@wikimedia.org [03:48:13] maybe also trustandsafety@wikimedia.org [03:59:22] ok emailed - that was a bit freaky tbh [04:00:04] yeah crazy stuff! [04:12:25] eileen: shall I merge the "Revert "Use drupal db for fredge" and set permissions more better" one? [04:12:39] AndyRussG: yep cos it's more better [04:12:52] you mean moar better? [04:12:58] okok yeah looks great [04:13:28] Oh I'm going to add some bug tags to the commit message first k? [04:13:55] oh yeah - please change to moar too [04:14:04] that's def moar better [04:14:12] ah okok [04:15:40] (PS2) AndyRussG: Revert "Use drupal db for fredge" and set permissions moar better [wikimedia/fundraising/crm/civicrm-buildkit] - https://gerrit.wikimedia.org/r/684635 (https://phabricator.wikimedia.org/T281609) (owner: Eileen) [04:15:58] (CR) AndyRussG: [C: +2] Revert "Use drupal db for fredge" and set permissions moar better [wikimedia/fundraising/crm/civicrm-buildkit] - https://gerrit.wikimedia.org/r/684635 (https://phabricator.wikimedia.org/T281609) (owner: Eileen) [04:16:02] (CR) AndyRussG: [V: +2 C: +2] Revert "Use drupal db for fredge" and set permissions moar better [wikimedia/fundraising/crm/civicrm-buildkit] - https://gerrit.wikimedia.org/r/684635 (https://phabricator.wikimedia.org/T281609) (owner: Eileen) [04:19:07] (CR) Eileen: "recheck" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/684537 (https://phabricator.wikimedia.org/T281609) (owner: Eileen) [04:19:17] ok let's see what that one does now [04:30:25] (PS1) Eileen: Catch and handle exceptions in Monolog [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/684664 (https://phabricator.wikimedia.org/T281647) [04:31:51] AndyRussG: so that one I just added ^^ - I think would cause monolog to degrade gracefully - the issue I believe is that the deprecated functions fixed in 684636 were triggering the log() function & it was loading the outdated cached container - since monolog wasn't registered as yet [04:32:33] all of which says we can handle more errors in monolog and remove the deprecated functions and I logged https://github.com/civicrm/civicrm-buildkit/issues/615 about the caching [04:33:48] (CR) jerkins-bot: [V: -1] Catch and handle exceptions in Monolog [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/684664 (https://phabricator.wikimedia.org/T281647) (owner: Eileen) [04:35:12] Fundraising-Backlog, FR-Docker, Patch-For-Review: [Bug] Docker dev setup: civibuild create wmff fails when wmff/vendor iexists - https://phabricator.wikimedia.org/T281647 (Eileenmcnaughton) Parts to this 1) the cause of the early attempt to do logging I believe is a deprecated function in old boiler... [04:35:37] AndyRussG: woot - https://gerrit.wikimedia.org/r/c/wikimedia/fundraising/crm/+/684537 v+2 [04:42:04] eileen: cool! will the api one pass ci now? or does it need to be rebased on that one? ^ [04:42:10] congrats btw! [04:45:13] AndyRussG: I think we should merge that one & then all the rest should start passing [04:45:41] the changes only affect ci - ie not prod or our buildkit [04:45:47] or our local I mean [04:45:51] ok [04:46:33] I'm assuming that the deleted lines with ${CIVICRM_SCHEMA_PREFIX}${i} and such are currently unused stuff or something? [04:47:40] (CR) AndyRussG: [C: +2] "aaaaaahhhhh yay!" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/684537 (https://phabricator.wikimedia.org/T281609) (owner: Eileen) [04:48:04] I may not fully understand the patch, but at least I can cheer for it [04:49:27] lol [04:49:37] it gets rid of complexity :-) [04:49:44] and it's moar better [04:51:02] it was an unexpected snaffu but I think we are ahead now [05:01:48] (Merged) jenkins-bot: Attempt to unravel pre-create [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/684537 (https://phabricator.wikimedia.org/T281609) (owner: Eileen) [05:02:13] (CR) Eileen: "recheck" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/682349 (https://phabricator.wikimedia.org/T268511) (owner: Eileen) [05:02:28] (CR) Eileen: "recheck" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/684664 (https://phabricator.wikimedia.org/T281647) (owner: Eileen) [05:03:09] (CR) Eileen: [C: +2] "recheck" [wikimedia/fundraising/crm/vendor] - https://gerrit.wikimedia.org/r/684510 (owner: Eileen) [05:03:52] (CR) Eileen: "recheck" [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/684636 (https://phabricator.wikimedia.org/T281647) (owner: Eileen) [05:06:41] (PS14) AndyRussG: E-mail pref ctr queue consumer using api [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/682349 (https://phabricator.wikimedia.org/T268511) (owner: Eileen) [05:07:49] ^ just rebased the queue consumer one [05:08:27] yep cool - I did a recheck on the others - not sure we want to deploy anything tonight now but can maybe get close [05:08:40] I'm just gonna get outside for a bit - back soon [05:17:20] (Merged) jenkins-bot: Vendor update, phpmailer, monolog handler [wikimedia/fundraising/crm/vendor] - https://gerrit.wikimedia.org/r/684510 (owner: Eileen) [05:21:30] eileen: k.... yeah it passed! https://gerrit.wikimedia.org/r/c/wikimedia/fundraising/crm/+/682349 [05:47:47] eileen: if you're about, would you like to kick this one again? https://gerrit.wikimedia.org/r/c/wikimedia/fundraising/crm/+/682349 [05:48:14] (I guess add your own +2? maybe you'd have to remove cstone's +2? I can also just click "submit", I guess) [05:49:02] hmmm ok sorry to be such a bureaucrat... just gonna submit heheh [05:49:58] (Abandoned) AndyRussG: WMFF: Drop fredge db before creating it [wikimedia/fundraising/crm/civicrm-buildkit] - https://gerrit.wikimedia.org/r/684138 (https://phabricator.wikimedia.org/T281609) (owner: AndyRussG) [05:50:12] (PS5) AndyRussG: WMFF: sync drupal users and set API key for Docker dev setup [wikimedia/fundraising/crm/civicrm-buildkit] - https://gerrit.wikimedia.org/r/684003 (https://phabricator.wikimedia.org/T281651) (owner: Ejegg) [05:50:41] (PS4) AndyRussG: WMFF: Static CIVI_SITE_KEY for Docker dev setup [wikimedia/fundraising/crm/civicrm-buildkit] - https://gerrit.wikimedia.org/r/684121 (https://phabricator.wikimedia.org/T281651) [06:11:46] (Abandoned) Eileen: phpmailer update to 6 [wikimedia/fundraising/crm/vendor] - https://gerrit.wikimedia.org/r/683482 (owner: Eileen) [06:13:58] It's merged! [06:14:22] eileen: yes I pushed the "submit" button [06:14:50] eileen: thanks so much for all your work on this! [06:14:56] K it's sleepy sleepy time time [06:14:59] I think we need to get our buildkit in sync with upstream - there are changes related to civi-sites upstream that we don't have [06:15:02] night [06:15:12] eileen: yes agreed [06:15:24] cya! :) [06:17:53] night [06:21:59] (PS1) Eileen: Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm into deployment [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/684699 [07:35:40] PROBLEM - check_mysql on frdev1001 is CRITICAL: SLOW_SLAVE CRITICAL: Slave IO: Yes Slave SQL: Yes Seconds Behind Master: 1253 [07:37:40] PROBLEM - check_mysql on frdb1002 is CRITICAL: SLOW_SLAVE CRITICAL: Slave IO: Yes Slave SQL: Yes Seconds Behind Master: 1287 [07:40:40] PROBLEM - check_mysql on frdev1001 is CRITICAL: SLOW_SLAVE CRITICAL: Slave IO: Yes Slave SQL: Yes Seconds Behind Master: 1486 [07:42:40] RECOVERY - check_mysql on frdb1002 is OK: Uptime: 396709 Threads: 11 Questions: 9004996 Slow queries: 175 Opens: 80941703 Flush tables: 1 Open tables: 273 Queries per second avg: 22.699 Slave IO: Yes Slave SQL: Yes Seconds Behind Master: 547 [07:46:57] Fundraising-Backlog, Analytics-Radar, BetaFeatures, BlueSpice, and 46 others: Prepare User group methods for hard deprecation - https://phabricator.wikimedia.org/T275148 (Aklapper) [07:47:35] Fundraising-Backlog, Analytics-Radar, BetaFeatures, BlueSpice, and 46 others: Prepare User group methods for hard deprecation - https://phabricator.wikimedia.org/T275148 (Aklapper) Re-added codebase tags, so people interested in tickets about a codebase can find these tickets about that codebase. [07:55:40] PROBLEM - check_mysql on frdev1001 is CRITICAL: SLOW_SLAVE CRITICAL: Slave IO: Yes Slave SQL: Yes Seconds Behind Master: 1233 [08:00:40] RECOVERY - check_mysql on frdev1001 is OK: Uptime: 3333847 Threads: 17 Questions: 87094897 Slow queries: 2727188 Opens: 678205254 Flush tables: 1 Open tables: 200 Queries per second avg: 26.124 Slave IO: Yes Slave SQL: Yes Seconds Behind Master: 0 [13:56:28] Fundraising-Backlog, FR-Docker, Patch-For-Review: Docker dev setup: follow-on Civiproxy setup - https://phabricator.wikimedia.org/T281651 (jgleeson) Hi @AndyRussG. Appreciate you writing some of this up for me and giving this your attention over the weekend. The first two tasks do feel like good impr... [14:03:13] (CR) Jgleeson: [C: -1] "Thanks for looking at this! After pulling in the latest patch on this chain and the linked latest on fundraising-dev, my local admin user " [wikimedia/fundraising/dev] - https://gerrit.wikimedia.org/r/684006 (https://phabricator.wikimedia.org/T281651) (owner: Ejegg) [14:04:53] (CR) AndyRussG: "> Patch Set 3: Code-Review-1" [wikimedia/fundraising/dev] - https://gerrit.wikimedia.org/r/684006 (https://phabricator.wikimedia.org/T281651) (owner: Ejegg) [14:05:13] (CR) Jgleeson: [C: +1] "Thanks for looking at this! This worked for me as expected. Nice work!" [wikimedia/fundraising/dev] - https://gerrit.wikimedia.org/r/684122 (https://phabricator.wikimedia.org/T281651) (owner: AndyRussG) [14:14:43] Fundraising-Backlog, FR-Docker, Patch-For-Review: Docker dev setup: follow-on Civiproxy setup - https://phabricator.wikimedia.org/T281651 (AndyRussG) >>! In T281651#7057497, @jgleeson wrote: > Hi @AndyRussG. Appreciate you writing some of this up for me and giving this your attention over the weekend... [14:16:07] (CR) Jgleeson: [C: -1] "Yep. wmff is on 47a2ffeefeb64ccc179d1a7531a07b6c620afbb8" [wikimedia/fundraising/dev] - https://gerrit.wikimedia.org/r/684006 (https://phabricator.wikimedia.org/T281651) (owner: Ejegg) [14:21:36] Fundraising-Backlog, FR-Docker, Patch-For-Review: Docker dev setup: follow-on Civiproxy setup - https://phabricator.wikimedia.org/T281651 (jgleeson) Yeah, agreed that it made sense to merge it as it was but I feel like the other follow-up tasks would have been better discussed and agreed on the patch... [14:41:31] AndyRussG: did the api key stuff work at your end? [14:47:41] jgleeson: yes currently working for me on the latest of stuffs... [14:48:06] note that buildkit source should also be at the latest patchsets of thos changes [14:48:09] 86d088e8852f8 for buildkit [14:48:27] also I removed the vendor directory under wmff [14:48:34] and reset persistent storage [14:49:08] ahhh though if it's not working for you it might be prudent to just set it manually again this one time [14:49:38] if I understand correctly, getting a version of e-mail pref center deployed is quite high priority today.... [15:04:19] oh man [15:04:23] I think I know what it was [15:05:10] looks like you changed docker-api-key to docker_api_key ha! [15:05:24] jgleeson: ahhh yes correct that was me heheheh sorry! [15:05:58] no worries. I just tried calling the api cli update and setting it to test and it worked so I was scratching my head [15:06:09] I also ran into an error where in one place it was underscore and the other place it was dashes [15:06:25] and set it to one, but I guess I didn't check which it was originally, sorry about that! [15:06:35] ahhh glad it worked then! [15:07:02] no worries. just thinking of a quick way to retest without rebuilding lol, as I've overwritten it to test [15:07:26] I'll update the patch and put it down for now based on the email-prefs deployment priority [15:08:25] :) thanks much! [15:10:26] (CR) Jgleeson: [C: +1] "removing -1 as I was looking for the wrong value, in the wrong database!!! When I realised I was looking at another install of civicrm and" [wikimedia/fundraising/dev] - https://gerrit.wikimedia.org/r/684006 (https://phabricator.wikimedia.org/T281651) (owner: Ejegg) [15:25:01] AndyRussG: seems to be working for me too [15:31:04] ejegg: cool! :) :) [15:34:12] oh wait, last night it was, but now I see an error.. hmm [15:34:27] lemme get debugging running on the civiproxy bit [15:35:55] ejegg: ^ update the latest crm (wmff) master, and also the latest patch set of last buildkit Gerrit change on the chain , and the same for fr-dev, and reset persistent storage, and remove wmff/vendor [15:36:10] sorry it's a bit involed [15:37:30] did they change since last night? [15:37:46] I rebuilt around 7 local time last night with the then-latest of everything [15:37:56] ejegg yes they changed since then :) [15:37:59] ok [15:38:00] all of the stuff [15:38:55] ejegg also just to bring u up to speed, apologies don't mean to tell u what to work on, yesterday it was emphasized that we might all pile onto getting e-p-c deployed [15:39:03] though I'm not sure what more we should do at this point [15:39:06] yep yep, i figured as much [15:39:15] I guess maybe deploying civi since the consumer patch is now merged? [15:39:18] well, all of us having it working locally seems good [15:39:29] heheh yes also important indeed ;p [15:39:33] right, the civi deploy [15:39:44] was the manual steps on civiproxy blocking you both? curious why that got reprioritised after the standup on friday? [15:39:47] also in about 10 min I should run to the bank, ahh apologies, won't take long [15:39:48] and then the localsettings for the new wiki [15:39:52] AndyRussG: ejegg ^ [15:40:31] jgleeson: it wasn't officially reprioritized at all, there was just... uh.... a rabbit.... [15:40:43] jgleeson: oh, on friday i just had a bolt from the blue occur to me that the auto syncing of contact records should be possible with the uf_match [15:40:44] (though also there wasn't much that could be done on e-p-c over the weekend) [15:41:19] and once I found that, I figured i might as well finish the job with setting the api key in a scripted way too [15:42:02] ejegg: yeah hugely appreciate u finding that eh! [15:42:29] cool [15:46:16] ok wrt the email preferences deployment... are we waiting on something to serve the code? https://phabricator.wikimedia.org/T281321 [15:46:52] I think that may still be a missing piece yeah [15:47:01] Jeff_Green: dwisehaupt any update on the server for civiproxy? [15:47:08] https://etherpad.wikimedia.org/p/emailpreference [15:47:24] jgleeson: working on it, there are a lot of moving parts [15:47:33] gotcha [15:47:43] sorry i was out yesterday so just wanted to check in [15:48:39] where we are right now--I think we've got clarity on what we need as far as redis service and roughly what the smashpig config should look like [15:48:57] we confirmed that civiproxy can hit a non-ssl version of civi and I think the frpm1001 job is done [15:49:08] ah thanks Jeff_Green [15:49:32] so right now I'm working on all the peripheral stuff to configure another redis instance and all the peripheral stuff around that, monitoring etc [15:49:54] jgleeson: great [15:51:02] are we separating out the redis instances for security ? [15:51:05] fr-tech^ [15:51:07] yes [15:51:15] fundraising-tech-ops, fr-email-preference-center: Add Apache/Nginx config to serve Civiproxy - https://phabricator.wikimedia.org/T281321 (Ejegg) [15:52:30] I'm trying to imagine the attack [15:52:39] from the email pref centre wiki [15:53:11] fwiw there's also privatebin running on that server [15:53:33] jgleeson: also maybe to limit PCI scope? [15:53:44] since the other redis instance talks to the payments servers [15:53:55] ah was that raised? [15:54:02] just speculating [15:54:10] I wasn't aware of the separate redis instance [15:54:20] i've only been popping in momentarily since thursday [15:54:31] got it [15:55:56] jgleeson: the theoretical attack issue is that if there were an issue with email prefs that led to someone to being able to query redis, we don't want them to be able to query the keys that contain payments information. user ACL separation doesn't come until redis 6 which we aren't currently running. [16:04:42] fr-tech K heading out to the bank, apologies, back in about 1hr [16:06:33] Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM, fr-donorservices: Civi: Unsubscribe CIDs with 'zero net' donations - https://phabricator.wikimedia.org/T273843 (krobinson) Closing this out as @KHaggard did some investigating and found out that: All refunds in Civi are handled correctly in Acoust... [16:06:56] Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM, fr-donorservices: Civi: Unsubscribe CIDs with 'zero net' donations - https://phabricator.wikimedia.org/T273843 (krobinson) Open→Resolved [16:20:30] Fundraising Sprint Humongous bacteria petting zoo, Fundraising Sprint Interstitial ads halfway down the coaster hill, Fundraising-Backlog, FR-Ingenico, Recurring-Donations: Failed recurring donation attempts making it to status 600 in Ingenico - https://phabricator.wikimedia.org/T281091 (EMart... [16:22:09] Fundraising Sprint Humongous bacteria petting zoo, Fundraising Sprint Interstitial ads halfway down the coaster hill, Fundraising-Backlog, FR-Ingenico, Recurring-Donations: Failed recurring donation attempts making it to status 600 in Ingenico - https://phabricator.wikimedia.org/T281091 (DStri... [16:22:16] Fundraising Sprint Humongous bacteria petting zoo, Fundraising-Backlog, FR-Ingenico, Recurring-Donations: Failed recurring donation attempts making it to status 600 in Ingenico - https://phabricator.wikimedia.org/T281091 (DStrine) [16:49:58] fr-tech I posted the work in progress smashpig config template and result for each role to frpm1001:/tmp/smashpig_puppet_new [16:52:16] as far as I can tell, apart from renaming the section "redis-servers" to more general "services" (which afaik doesn't matter except for readability) the new looks to me like it's producing the same yaml data, there's a silly python test script in the top level that dumps the data structures for comparison [17:02:25] looking Jeff_Green [17:03:35] fundraising-tech-ops, fr-email-preference-center: Add Apache/Nginx config to serve Civiproxy - https://phabricator.wikimedia.org/T281321 (Dwisehaupt) [17:06:17] Jeff_Green: only the ruby script is readable [17:06:26] oh whoops, fixing [17:07:12] fixed [17:07:50] fundraising-tech-ops, fr-email-preference-center: Add Apache/Nginx config to serve Civiproxy - https://phabricator.wikimedia.org/T281321 (Dwisehaupt) I have pushed out the apache and nginx configs. nginx is serving on port 442 with the puppet ssl certs and forwarding to a low proxy port for apache. Still... [17:09:25] jgleeson: fwiw it's easy to deploy the new-format conf to frdata* without touching the template/format for the other servers, it just crufts up puppet a little [17:10:50] yeah that looks good to me [17:11:11] cool [17:11:44] (back) [17:12:19] AndyRussG: see ^^^ backscroll re. work in progress for puppetized smashpig config [17:14:40] Jeff_Green: ahh cool thx! looking... [17:17:45] (CR) Ejegg: [C: +2] "Works for me!" [wikimedia/fundraising/crm/civicrm-buildkit] - https://gerrit.wikimedia.org/r/684003 (https://phabricator.wikimedia.org/T281651) (owner: Ejegg) [17:18:20] (CR) Ejegg: [V: +2 C: +2] "Looks good, works fine!" [wikimedia/fundraising/crm/civicrm-buildkit] - https://gerrit.wikimedia.org/r/684121 (https://phabricator.wikimedia.org/T281651) (owner: AndyRussG) [17:18:24] (CR) Ejegg: [V: +2 C: +2] WMFF: sync drupal users and set API key for Docker dev setup [wikimedia/fundraising/crm/civicrm-buildkit] - https://gerrit.wikimedia.org/r/684003 (https://phabricator.wikimedia.org/T281651) (owner: Ejegg) [17:20:35] (CR) Ejegg: [V: +2 C: +2] "Looks good, works for me locally!" [wikimedia/fundraising/dev] - https://gerrit.wikimedia.org/r/684006 (https://phabricator.wikimedia.org/T281651) (owner: Ejegg) [17:21:14] (CR) Ejegg: [V: +2 C: +2] "Looks good, matches other key, works for me locally!" [wikimedia/fundraising/dev] - https://gerrit.wikimedia.org/r/684122 (https://phabricator.wikimedia.org/T281651) (owner: AndyRussG) [17:28:33] AndyRussG: when loading trying to load up email-prefs wiki I see this https://phabricator.wikimedia.org/F34440480 am I missing some config maybe? [17:28:51] jgleeson: the link needs more params [17:28:56] here's a better one: [17:29:05] https://localhost:9002/index.php/Special:EmailPreferences/emailPreferences?contact_hash=1027858961&contact_id=188 [17:29:29] thanks! [17:29:31] I /think/ that sample data hash and id are consistent across reinstalls [17:30:21] then you can change the contact's preferred language in civi manually if you want: https://wmff.localhost:32353/civicrm/contact/add?reset=1&action=update&cid=188 [17:30:37] (need to expand the 'Communication Preferences' group 3rd from bottom) [17:31:05] core data, not to be confused with the 'Communication' custom data group [17:31:47] oh hey, we should set opt-in source in the prefs queue consumer when it's not already set [17:36:50] Jeff_Green: I can't recall seeing the email-preferences smashpig queue. Was there a queue called that in one of those files? [17:37:04] in the new/old config [17:37:07] jgleeson I think we just added that [17:37:17] oh, lemme look at the new version [17:37:32] yeah ejegg, Jeff_Green was asking if the config he put up with the new dynamically generated additions looked good [17:38:24] oh hey it's in frdata [17:38:30] ok yeah, the old config has email-preferences with just the <<: *REDIS backref [17:38:31] in the new dir [17:39:20] jgleeson: ah good point, it shows up only for frdata, b/c haven't added it the civicrm role manifest yet [17:39:34] oh yah, civi will need that too [17:39:50] yeah, easy to add, I just spaced it [17:40:00] coolio [17:40:06] does this format look ok otherwise? [17:40:12] does to me [17:40:46] yep, looks fine to me [17:41:15] any concern about rolling it out? or should I just go for it [17:41:15] seems to have a couple stray newlines, but nothing that affects the actual interpretation of the yaml [17:41:38] maybe we stop the queue consumers first? [17:41:43] and do a slow start [17:41:50] after deploy [17:41:52] where re. the newlines? [17:42:00] sounds good ejegg [17:42:38] Jeff_Green: never mind about the newlines [17:42:56] just the one right after the data-store: key caught my eye [17:43:16] but srsly no need to change [17:43:43] ok [17:44:08] Jeff_Green: so the frdata one has no provider-configuration-directory key [17:44:27] which means it will look for e.g. logging config in /etc/smashpig/provider-defaults.yaml [17:44:30] (CR) DannyS712: [C: +2] build: Updating composer dependencies [extensions/FundraisingTranslateWorkflow] - https://gerrit.wikimedia.org/r/685004 (owner: Libraryupgrader) [17:44:55] oh, right, there was confusion about that yesterday [17:45:00] should it have that? [17:45:14] and if that file's not there it will use these defaults: https://phabricator.wikimedia.org/diffusion/WFSP/browse/master/config/provider-defaults.yaml [17:45:19] it would be better to have that [17:45:24] ok, fixing [17:45:41] so it can send failmail if necessary [17:45:53] yep! [17:47:01] so there are two possibilities - either just deploy provider-defaults.yaml to /etc/smashpig on the frdata host [17:48:34] or add that provider-configuration-directory key to main.yaml pointing to the /srv/ subdir and then make some more changes in the SmashPig f_c_u project so that frdata only gets provider-defaults from that folder, and none of the processor subdirs [17:48:58] maybe putting provider-defaults.yaml in /etc/smashpig on frdata is easier? [17:49:47] sec, I'm doing too many things at once to absorb [17:50:26] k [17:51:19] hmmm [17:51:35] is provider-defaults.yaml in localsettings otherwise? [17:55:06] yep [17:55:49] though that file sees very few edits from devs [17:55:52] Jeff_Green fr-tech what I see in smashpig_puppet_new looks fine to me btw, also agreed with ejegg ^ sorry almost forgot about that [17:56:00] thx for cleaning all that up btw! [17:56:02] ejegg: should we just puppetize it everywhere? [17:56:08] AndyRussG: great [17:56:10] mostly the files in provider subdirectories are what devs need to edit [17:56:48] Jeff_Green ejegg I guess we do want to make sure none of the private provider account info is there [17:57:04] Jeff_Green: I think we still want devs to be able to edit + deploy the provider settings when necessary [17:57:10] feels like puppetizing that on frdev might be a nice way to lock it down? [17:57:27] *sorry I mean frdata [17:57:35] the upside of puppetizing is the ease of varying by server role [17:57:49] and SmashPig's current config code always looks for provider settings and that provider-defaults.yaml file under the same dir [17:58:17] Jeff_Green ejegg ^ so agreed with ejegg about allowing developer updates to provided subdirectories there for civi and smashpig and anywhere other than frdata [17:58:43] but maybe for frdata, where the e-p-c will live, if we just have the static thing for the logging config, it's sufficient, so better to puppetize that bit? [17:58:45] we could puppetize to /etc/fundraising and have f_c_u drop a symlink in the web tree? [17:59:02] maybe I'm wrong? apologies if I'm over-complicating it [17:59:30] Jeff_Green: sure, that works. though it's /etc/smashpig [17:59:36] probider-defaults as usual right? [17:59:38] ah right! [17:59:43] provider* [17:59:45] yah jgleeson [18:00:20] oh, looks like we need an update to our 'NoLoginLinkOnMainPage' fn that hides the login links [18:00:33] ah [18:00:56] to avoid further confusion, I'll update that once Jeff_Green has unspooled his current tasks :) [18:01:17] sure [18:01:18] ok so first... [18:01:26] I'm having some issues with the email preferences civi side of things [18:01:41] switch to the new main.yaml template for everywhar [18:01:53] (after stopping queues) [18:01:57] 2) add provider-configuration-directory back [18:02:17] AndyRussG: cstone when i test this patch, I see the message being processed but I don't see changed updated in civicrm or anything new in the civiproxy request to the contact I updated https://gerrit.wikimedia.org/r/c/wikimedia/fundraising/crm/+/682349 [18:02:24] ejegg: ya, I'm thinking through the puppet changes first [18:02:35] oh shoot, really jgleeson? [18:02:49] Lemme debug through that and make sure it actually IS working for me locally [18:02:55] the directory doesn't change here does it? "provider-configuration-directory: /srv/www/org/wikimedia/listeners/SmashPig/local-config" [18:02:56] I've tried two [18:03:10] that should be correct Jeff_Green [18:03:17] ok [18:04:07] 3) add the new queue conf to the civicrm role [18:04:16] Jeff_Green: oh, just one tiny thing on the new template [18:04:21] ya? [18:04:34] lemme see if I can get xdebug running also [18:04:37] if we ever need a new sequence generator, the 'sequence:' key will differ [18:04:46] looking [18:05:33] so that key should probably not be part of the &QUEUE_REDIS_SEQ reference [18:05:47] ok [18:06:49] Fundraising Sprint Git Rebase Jump, Fundraising Sprint Humongous bacteria petting zoo, Fundraising-Backlog, MW-1.37-notes (1.37.0-wmf.3; 2021-04-27), Patch-For-Review: Non-english soft descriptor - https://phabricator.wikimedia.org/T277598 (DStrine) Resolved→Open [18:07:02] darn, though I forget how you override just one subkey of the backreference [18:07:30] meh, it should work as is [18:07:49] I think I've got it, I'll test it with the yaml-extorter script [18:07:59] lol @yaml-extorter [18:08:07] :-) [18:08:14] break that file's kneecaps if it doesn't encode the right thing [18:08:24] jgleeson: just gonna check again [18:08:44] jgleeson: remember country doesn't get updated [18:12:13] I was looking in the activity log AndyRussG and around the address info [18:12:22] in civiland [18:13:18] Fundraising Sprint Git Rebase Jump, Fundraising Sprint Humongous bacteria petting zoo, Fundraising-Backlog, MW-1.37-notes (1.37.0-wmf.3; 2021-04-27), Patch-For-Review: Non-english soft descriptor - https://phabricator.wikimedia.org/T277598 (DStrine) a:Cstone→None [18:14:45] Fundraising Sprint Git Rebase Jump, Fundraising Sprint Humongous bacteria petting zoo, Fundraising-Backlog, MW-1.37-notes (1.37.0-wmf.3; 2021-04-27), Patch-For-Review: Non-english soft descriptor - https://phabricator.wikimedia.org/T277598 (EMartin) Hi, I checked this descriptor situation and... [18:16:10] jgleeson: so the country/address part is not updated [18:16:23] because there's a follow-on task to work on that [18:16:33] it does update opt_in and preferred language [18:17:15] ahh ok [18:17:18] though I'm having trouble seeing the update to language in civi, but it is in the database [18:18:16] also fr-tech, I just pushed up a new process-control job (with slow-start) to localsettings to call the email-preferences queue consumer. it's called email-preferences-queue-consume.yaml [18:18:36] that was marked as pending on our list [18:18:51] I'll set that to in-review [18:19:23] jgleeson: ah cool thanks! [18:19:24] ah AndyRussG I can see the updated preferred language in the civiproxy request [18:19:47] should there be an update on the activity log also? [18:19:53] (for the contact) [18:20:16] jgleeson: if you reload the e-p-c user-facing page the current settings show the updated data [18:20:18] also [18:20:29] jgleeson: wrt activity log, that's a great question, I have no idea [18:20:44] just looking now, I didn't see any such logs, though i may well not be looking right [18:21:10] ah ok I can see the language change but the country selection is disregarded [18:21:15] that's a follow-up right? [18:21:22] thanks, at least I can see it working [18:22:18] hey im back now [18:22:36] jgleeson: yes, it's a follow-up because there were still details to figure out about how that would be reflected in the db [18:22:44] cstone hiii :) [18:22:49] ejegg AndyRussG jgleeson Ok I refreshed frpm1001:/tmp/smashpig_puppet_new/new/* with I think all the fixes we've talked about here ^^^^ [18:22:52] AndyRussG: I was looking at the activity log in relation to the address. We were going to add a new address type of email-preferences the lastt I recall but that may have changed [18:23:10] AndyRussG + jgleeson there won't be an 'Activity' associated with the change [18:23:19] though we could update the queue consumer code to make one [18:23:35] how come? [18:23:38] jgleeson: the address part isn't written yet [18:23:47] gotcha [18:23:54] sorry I didn't know this [18:24:05] oh, and the address log I think comes from the civicrm trigger-based logging [18:24:31] which i think may not be activated in fundraising-dev [18:24:38] ahh [18:24:44] ok Jeff_Green, looking again [18:25:06] jgleeson: https://phabricator.wikimedia.org/T280674 [18:25:45] ejegg: oh we should activate that then, if it's activated on prod? [18:25:47] AndyRussG: ithanks [18:25:49] -iu [18:25:51] -u [18:25:53] :) [18:26:00] ok one other thing [18:26:09] the queue message contains: [source_name] => DonationInterface [18:26:10] [source_type] => payments [18:26:12] [source_host] => 3d432b5689f8 [18:26:43] not major but we might wanna update it [18:26:52] jgleeson: oh hey yeah good catch! [18:27:07] no idea where the source_name and source_type come from [18:27:13] must be in queue config somewherez [18:27:22] they get set in the bowels of smashpig I think [18:27:34] bah i used to know this [18:27:36] ooh, lemme see [18:27:51] it's on the Context object [18:28:10] hmmm not a fan of demolished pig guts [18:28:13] so I think we'd want to pass that from the place we init it in the email prefs center code [18:28:39] ejegg: so it's not a config setting we can set differently on e-p-c wiki? [18:28:54] we'll have to write some code to make it a config setting [18:29:05] in DonationInterface, I think [18:29:11] I'll have a patch in a few min [18:29:22] ejegg: so the string "payments" is hardcoded somewhere in sp? [18:29:26] grrr phpstorm forgets my github integration AGAIN AFADFASF [18:30:14] https://github.com/wikimedia/wikimedia-fundraising-SmashPig/blob/4cfc0861f281f30b6e10f7b53d8a3a3f2e6d2426/CrmLink/Messages/SourceFields.php#L14 [18:30:20] those fields are set there [18:30:24] jgleeson: does it just get those from the git remotes? [18:30:41] yep ejegg [18:30:58] AndyRussG: not hardcoded in sp, hardcoded somewhere in DonationInterface [18:30:58] I think maybe when I'm rebuilding/wiping stuff the git config is lost [18:31:02] so I have to readd it often [18:31:13] which makes me grrr [18:32:02] AndyRussG: here -> https://phabricator.wikimedia.org/diffusion/EDOI/browse/master/DonationInterface.class.php$51 [18:33:17] question re. provider-defaults.yaml [18:34:31] I think we're saying that be puppetized in the form it is now, to /etc/smashpig/provider-defaults.yaml with a symlink pointing there from its current location in the /srv tree [18:35:17] and that the version that ends up on frdata will exclude the email/failmail config (?) [18:36:17] ejegg/andyrussg ^^ [18:36:22] ejegg: thanks! [18:36:30] (PS1) Ejegg: Make source_type field configurable [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/685033 (https://phabricator.wikimedia.org/T268511) [18:36:47] Jeff_Green: oh, I was thinking it would still have the failmail config [18:36:48] hmm I don't know about excluding email [18:36:51] Jeff_Green: I think that the opposite, we do want frdata e-mail [18:36:55] oh ha! [18:37:01] we have a consensus ... [18:37:05] but we don't want any of the payment provider keys etc [18:37:25] there aren't any keys in the file that's in localsettings [18:37:49] can you guys take a look and drop a proposed version in /tmp on frpm1001? I'll work the variations into a template [18:38:03] ok, looking [18:38:26] AndyRussG: I attached https://gerrit.wikimedia.org/r/685033 to a semi-arbitrary phab task [18:38:37] but that should get us source_type configurability [18:39:13] ejegg: cool thx! [18:41:10] (CR) jerkins-bot: [V: -1] Make source_type field configurable [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/685033 (https://phabricator.wikimedia.org/T268511) (owner: Ejegg) [18:41:14] oh I think I misunderstood, are we puppetizing all of localsettings/Smashpig? [18:41:15] ooops [18:41:17] lessee [18:41:36] Jeff_Green: wellll, can devs deploy some subset of puppetized stuff? [18:42:07] thinking [18:42:13] ejegg: that patch is working for me but failing tests https://gerrit.wikimedia.org/r/c/mediawiki/extensions/DonationInterface/+/685033 [18:42:31] yah, stray space [18:42:39] jeez [18:42:46] (PS2) Ejegg: Make source_type field configurable [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/685033 (https://phabricator.wikimedia.org/T268511) [18:43:14] ejegg: there's not a simple way to do that, but now I'm starting to wonder whether it would be feasible to have puppet deploy from localsettings [18:43:31] Jeff_Green: because we DO now need to deploy the provider subfolders to all machines except the email pref center [18:43:34] that would be a convoluted tangled web [18:43:43] (CR) Jgleeson: [C: +2] "Working for me! nice" [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/685033 (https://phabricator.wikimedia.org/T268511) (owner: Ejegg) [18:44:35] Jeff_Green: so the other possibility is to deploy those subfolders everywhere but NOT include the provider-configuration-directory on frdata [18:44:37] ejegg: I see. I have to fetch my daughter from school, back in 20, will ponder [18:44:42] so SmashPig just doesn't have access to them [18:44:50] and only looks at what's in /etc/smashpig [18:45:00] ejegg: localsettings doesn't know how to vary by destination [18:45:13] * Jeff_Green back in a bit [18:45:56] jgleeson: the queue consumer job looks great, thanks! [18:46:26] (Merged) jenkins-bot: Make source_type field configurable [extensions/DonationInterface] - https://gerrit.wikimedia.org/r/685033 (https://phabricator.wikimedia.org/T268511) (owner: Ejegg) [18:46:34] I'll mark that as done [18:46:58] fr-tech that localsettings invariability is annoying - part of the 'mission' of SmashPig was to have a single source of config that we could access everywhere [18:47:09] and now suddenly we don't want it to be the same everywhere [18:47:19] hmm [18:47:50] we CAN just make those settings unavailable to SmashPig on frdata [18:47:59] by omitting the provider-configuration-directory key [18:48:07] since main.yaml is puppetized [18:48:59] are deploying a variant of the localsettings/SmashPig and not a specific localsettings/civiproxy/SmashPig structure ejegg ? [18:49:18] hmm? [18:49:49] there's just one localsettings/SmashPig/local-config directory which is deployed along with SmashPig code updates [18:50:04] yep [18:50:07] err, or rather deployed using the f_c_u and rsync tools that we use to deploy code updates [18:50:10] so basically I meant to say [18:50:17] why are there provider subfolders? [18:50:25] in email-prefs [18:50:29] there doesn't need to be right? [18:50:54] correct, that machine will never need those settings [18:51:18] but the only deployment tool that knows how to deploy different versions of code to different machines is puppet [18:51:31] and things that are deployed by puppet require ops [18:51:47] while we still want devs to be able to e.g. update API keys when we need to [18:52:01] or tweak fraud filter scores [18:52:13] (those are in smashpig for adyen) [18:53:46] 0_0 [18:57:56] back [18:58:38] so Jeff_Green simplest I can think of is to add a new SmashPig-epc project to f_c_u [18:58:46] which just ignores localsettings [18:58:46] yeah that would work [18:58:56] and get rid of the provider-configuration-directory [18:59:05] in the fr-data main.yaml [18:59:22] so it just looks in the /etc/smashpig/provider-defaults.yaml [18:59:41] Jeff_Green: ohhhhhhh [18:59:45] heyyy [18:59:50] no new project needed! [18:59:56] ? [19:00:00] we don't actually need any code from Smashpig in /var/www [19:00:16] SmashPig is only deployed to e-p-c as a library in the /vendor dir of mediawiki [19:00:31] interesting [19:00:37] so just don't add frdata as a deploy target to smashpig [19:01:10] right, I had thought about that a long time ago [19:01:16] and totally forgot till now [19:01:34] so we DO want the /etc/smashpig/main.yaml you've just templated out [19:01:46] you know, just checked and this is already how it's set up :-P [19:01:57] and we DO want the newly-puppetized /etc/smashpig/provider-defaults.yaml [19:02:03] and that should be enough [19:02:07] what about provider-defaults.yaml? [19:02:23] yep yep, we want that in the default /etc/smashpig directory [19:02:36] with the logging + failmail config [19:02:50] that match the rest of the machines [19:03:03] and that config will live under /localsettings/civiproxy right ejegg ? [19:03:15] jgleeson: no [19:03:22] whys not! [19:03:23] this is still all SmashPig config [19:03:55] why are we coupling them? sorry if you've already explained [19:04:00] we only need basic config [19:04:35] oh wait [19:04:40] civicrm needs them also [19:04:59] jgleeson: right, since frdata is NOT in the deploy targets for the standalone SmashPig code, we won't actually deploy those localsettings to frdata [19:04:59] is that the issue, we need one place to send them all from [19:05:18] but main.yaml, which includes the queue settings, is deployed by puppet [19:05:31] so it CAN include different settings for different targets [19:05:48] does provider-defaults.yaml need to vary at all between roles? [19:06:01] Jeff_Green: nope, it should be the same all around [19:06:25] so I can puppetize that to deploy everywhere we're installing /etc/smashpig/main.yaml [19:06:31] yep Jeff_Green [19:06:32] then there's the question of how smashpig finds it [19:06:51] and like you said, we replace the localsettings version of it for all the other machines with a symlink to /etc/smashpig/ [19:07:09] ok, that might work, but i'll need to test it [19:09:48] where would the symlink be? right now it's in the SmashPig project deployed to /srv/www/org/wikimedia/listeners/local-config/provider-defaults.yaml -- I think that case is easy enough, and will just work [19:10:19] but that entire web directory is what we're talking about leaving off of frdata [19:11:04] ejegg: ^^ [19:15:47] yep yep Jeff_Green, since that directory is only deployed with the SmashPig f_c_u project, it's not going to be going to frdata [19:16:07] and all we have to do is remove the provider-configuration-directory key from frdata's main.yaml [19:16:22] so SmashPig looks in /etc/smashpig/ [19:16:29] so on frdata, no symlink is needed [19:16:31] ah! ok got it [19:16:47] only need that symlink where the SmashPig f_c_u project is deployed [19:17:30] I'm glad you understand ejegg [19:17:34] so here's what I'll do--I'll puppetize that everywhere and then after the dust settles I'll do the f_c_u symlink switch for the other roles [19:17:50] ok, sounds good Jeff_Green [19:18:14] hah jgleeson once upon a time we had a single /etc/smashpig.yaml file [19:18:36] feels like we need another one ha! [19:18:41] noooooo [19:19:04] you know, it occured to me to ask if we should just roll the provider-defaults stuff into main.yaml... [19:19:29] Jeff_Green: might be nice, but that would require another overhaul of the SmashPig config code [19:19:32] \ (o◡ o) / [19:19:43] ejegg: ok [19:19:45] i don't think we're ready for that right now [19:20:13] jgleeson: so the whole reason we HAVE that provder-config-dir key is to accomodate our deploy tools [19:20:31] so that ops can be in charge of main.yaml with all the data connection keys [19:20:44] and devs can be in charge of processor-specific settings [19:25:32] gotcha ejegg [19:26:11] lemme see if we explain that in our docs... [19:31:15] alright, I think this is all ready to deploy [19:36:09] I wonder if it would make sense to change the way we're using localsettings entirely, and deploy all the provider config as standalone projects [19:36:25] (PS1) Ejegg: Document alternate provider config dir [wikimedia/fundraising/SmashPig] - https://gerrit.wikimedia.org/r/685069 [19:36:59] rather than tying it to SmashPig or civicrm, it could be i.e. provider-conf-staging vs provider-conf-production etc [19:37:03] oops fr-tech coming to meeting now [19:38:09] Jeff_Green: isn't that how it works now? I think we don't need to change that [19:39:09] there's no concept of SmashPig-staging now [19:39:20] so that whole tree goes everywhere SmashPig does [19:40:14] if we separate the code from config, you could deploy SmashPig everywhere, and the role-appropriate conf only where it belongs [19:40:20] ohh, so you're thinking about frdev? [19:40:48] yep, also wondering if all the other roles actually need all the config they're getting [19:41:05] we do have a staging-config directory in the localsettings SmashPig dir [19:41:37] saw that [19:42:22] so the staging config is ending up (unused) on the prod hosts, etc [19:42:38] yah [19:42:55] something to ponder for another day [19:43:25] meanwhile I'm ready to roll out the new template whenever you guys are ready for a consumer stop [19:47:50] (PS1) Ejegg: Merge branch 'master' into deployment [extensions/DonationInterface] (deployment) - https://gerrit.wikimedia.org/r/685077 [20:02:05] (PS1) Umherirrender: Replace uses of DB_MASTER with DB_PRIMARY [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/685084 [20:07:33] (CR) jerkins-bot: [V: -1] Replace uses of DB_MASTER with DB_PRIMARY [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/685084 (owner: Umherirrender) [20:10:18] (PS2) Umherirrender: Replace uses of DB_MASTER with DB_PRIMARY [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/685084 [20:18:34] Fundraising-Backlog: Consolidate fr-tech onboarding documentation - https://phabricator.wikimedia.org/T244516 (mepps) a:mepps→None [20:19:02] Fundraising Sprint Pseudopretzels, Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM: Add utm_medium to failed recur email - https://phabricator.wikimedia.org/T256184 (mepps) a:mepps→None [20:34:51] fr-tech unless there are any objections I'd like to deploy the smashpig config changes [20:41:01] Jeff_Green: what I saw of it looked great, though I wasn't able to follow the details of the provider directory/deploy differences for e-p-c [20:43:10] AndyRussG: for the part I'm deploying today the gist is it will be the new main.yaml and provider-defaults.yaml both deployed to /etc/smashpig/ everywhere, and for only on frdata* removing "provider-configuration-directory" from main.yaml so the wiki will actually read both files [20:43:53] separately/later we'll remove provider-defaults.yaml from the web tree, and have f_c_u drop a symlink in its place pointing to the file in /etc/smashpig [20:44:14] Jeff_Green: deploying it to production now? [20:44:24] if that's ok? [20:44:30] hmmm [20:44:51] Jeff_Green: sounds like a good summary but I guess i still don't undestrand those last details, like "the wiki will actually read both files", and basically everything from there [20:45:21] I could probably figure it out, so maybe you can put the notes and pointers to updated files either on a task or the etherpad, just to document how it's being done? [20:45:31] I'd like one of us to test our the new generated blocks maybe first [20:45:37] ah, my understanding is the wiki reads main.yaml and what it does next is dependent on the provider-configuration-directory setting [20:45:39] before we deploy it to all sites [20:45:39] Jeff_Green: also if others are OK with that provider dir stuff it's fine [20:45:53] jgleeson: makes sense [20:46:01] out* [20:46:47] jgleeson: ok, I'll post the final versions of the files [20:46:51] I guess just the high-level understanding I had was that avoid payment provider stuff on e-p-c but do have the logging and queue configs, and keep other locations the same, except for adding the new queue and queue server settings... but I think you knew that already :) [20:46:58] unfortunately I've gotta drop off and I think ejegg has a lot going on around him at the moment. AndyRussG are you ok trying out the new format locally just to see how stuff works with the various queues/cosumers? [20:47:25] testing will be as simple as pushing/consuming a few donations/prefs [20:47:33] jgleeson: I think so yeah [20:47:42] AndyRussG: yes, this achieves that. We won't need to deploy the SmashPig project at all, so none of the provider files from localsettings will exist on frdata* [20:47:44] pretty much just confirming the config is read in correctly [20:48:36] just so I understand--you're going to grab the new file (format) and hand edit sandboxy values and test from your sandboxes? [20:49:08] I also fully understand the changes in how we're handling provider defaults (sorry I followed some of it but got lost) so don''t feel confident oking the push to live but I'm sure it just needs one of us to understand it'll be good to go [20:49:30] ok [20:51:43] to be clear, short term the only change on roles other than frdata will be the reformatting of main.yaml with the additional redis settings, plus the addition of /etc/smashpig/provider-defaults.yaml which will be unread/ignored by smashpig due to the override in main.yaml [20:52:52] ok that makes sense [20:53:02] and the format thing LOOKS good [20:53:17] also I guess if we're wrong and both copies of provider-defaults.yaml get read, they're identical anyway! [20:53:28] yeah, I totally get the need to test it [20:54:09] is there anything you guys need from me to test, or will you be good to go once I drop the final version in tmp on frpm1001? [20:54:53] I'll hang around a little longer. yeah if you could push up the final files we can then adjust the host info locally and just confirm they get found as expected [20:55:10] AndyRussG: I'll take the payments/email-prefs side if you wanna take civi [20:55:15] ok. we can also do this tomorrow, I realize it's late there [20:56:01] Jeff_Green: shouldn't take more than 10 minutes to update and push through a message. I don't mind doing a bit now [20:56:07] ok [20:56:49] lemme know when the final format in on frpm [20:56:55] fetching them now [20:56:58] cool! [20:58:23] ok they're up, same place [20:59:09] looking [20:59:10] jgleeson: you mean for locally testing the sp config? [21:02:12] so the final stuff is again in /tmp/smashpig_puppet_new ? [21:02:29] yes, in ./new [21:02:36] doesn't look like contents there were updated recently? [21:03:01] looking [21:03:06] frpm1001:/tmp/smashpig_puppet_new/new$ ls -lha [21:03:07] total 28K [21:03:09] drwxr-xr-x 2 jgreen jgreen 4.0K May 4 20:57 . [21:03:11] drwxr-xr-x 4 jgreen jgreen 4.0K May 4 18:19 .. [21:03:13] -rw-r--r-- 1 jgreen jgreen 2.5K May 4 20:57 civi-main.yaml [21:03:15] -rw-r--r-- 1 jgreen jgreen 398 May 4 20:57 frdata-main.yaml [21:03:17] -rw-r--r-- 1 jgreen jgreen 2.2K May 4 20:57 frpig-main.yaml [21:03:19] -rw-r--r-- 1 jgreen jgreen 3.1K May 4 16:48 main.yaml.erb [21:03:21] -rw-r--r-- 1 jgreen jgreen 2.2K May 4 20:57 payments-main.yaml [21:03:29] updated just now [21:03:32] UTC [21:03:54] ignore main.yaml.erb -- I didn't bother refreshing that [21:04:03] $ date [21:04:05] Tue 04 May 2021 09:03:39 PM UTC [21:04:05] yeah AndyRussG literally just pasting in that config format and trying to submit stuff [21:04:27] oh woops pm vs 24hr time [21:04:28] AndyRussG: files updated 7 minutes ago [21:04:29] sorry [21:04:32] ha [21:04:38] yeah I was reading the 09:03 as 9 am [21:04:42] gotcha [21:04:44] :-P [21:04:53] ok I can try the civi one locally [21:13:23] getting an issue locally running email prefs consumer [21:13:42] jgleeson: ? [21:13:48] something is trying to access localhost although the only queue info is for host: queues [21:14:09] huh [21:14:11] gonna test payments frontend first [21:14:12] maybe the db config [21:14:33] it's via the redis port [21:14:36] jgleeson: I think somewhere it tries to check for the existence of the damaged table or something [21:14:38] oh hmmm [21:14:57] likely config related. gonna check payments then dig in [21:17:13] payments also not working lol [21:17:26] I'll check the files to see if I've updated them correctly [21:22:48] jgleeson: did you update provider-configuration-directory for your local setup? [21:23:03] is there config testing I can help with? [21:23:50] cstone ^ yeah! jgleeson is trying out the new frdata-main.yaml file locally, and I'm doing the same for the civi-main.yaml one [21:23:57] not sure if we can test out the frpig one [21:24:33] yeah AndyRussG [21:25:56] jgleeson cstone Jeff_Green the civi one is working fine, at least for the e-p-c queue consumer [21:26:16] yay! [21:26:29] you're able to consume donations ok? [21:26:46] I'm getting issues with the sequence generator [21:26:54] not sure if the nesting is different [21:27:10] jgleeson: i haven't tried that yet [21:27:15] oh also AndyRussG the epc queue consumer didn't work for me [21:27:28] are you using the cut down config Jeff_Green posted for frdata? [21:27:51] (CR) Eileen: "I have to coment here to get rid of 'has draft comments' to get it off the top of the gerrit dashboard" (1 comment) [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/682346 (https://phabricator.wikimedia.org/T279983) (owner: Eileen) [21:27:52] sorry ignore that [21:28:04] you're not testing the FRONTEND... I forgot [21:28:17] I'm gonna do that deploy now.... [21:28:25] (CR) Eileen: [C: +2] Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm into deployment [wikimedia/fundraising/crm] (deployment) - https://gerrit.wikimedia.org/r/684699 (owner: Eileen) [21:28:25] although that also isn't working for me Andy [21:28:51] eileen: ah thanks! [21:28:51] the frontend of email prefs works but consuming the message shows an error [21:29:17] jgleeson Jeff_Green cstone here is how I adapted the civi-main.yaml locally: https://paste.toolforge.org/view/40593b07#ewHmQGvw0RTv3ntW0d4gFGV3BndfNxHU [21:29:38] jgleeson: maybe past somewhere like that your locally adapted version ^ ? [21:29:40] cool, I'm double checking the sequence-generator blob [21:30:27] !log civicrm revision changed from 33a63d5789 to 94e321dbe0, config revision is a212d6ab23 [21:30:33] Logged the message at https://wikitech.wikimedia.org/wiki/Server_Admin_Log [21:32:21] testing with that yaml_dumper script I dropped in that same dir on frpm1001--it looks to me like the resulting data object for sequence-generator is the same [21:33:46] ok mine is also working Jeff_Green AndyRussG cstone [21:34:03] I had some indentation being lost when catting out the files on frpm1001 [21:34:09] that went out & is enabled but checking if it is working [21:34:32] jgleeson: cool [21:34:56] I don't see the line in syslog - not sure why yet [21:36:16] yeah phpstorm seems to change the indentation when I paste the file in -_- [21:36:27] not good [21:36:46] eileen: whihc line in syslog? also thx!! [21:36:57] completely not relevant but i am seeing infinite smashpig folders on wmff haha [21:37:48] AndyRussG: I think there should be a line logged to syslog when 2 contacts are merged using Civi::log('wmf') [21:38:09] jgleeson: good thing it's not pystorm [21:38:12] infinite smashpig sounds like a good band name. [21:38:26] it's only that one place that would be affected - & I'm gonna recheck [21:38:56] dwisehaupt: oh now I'm going to have to name this midi-patch mess I have going infinite smashpig [21:39:06] haha [21:41:27] eileen: oh hmmm [21:41:38] (CR) Eileen: "> Patch Set 1:" [wikimedia/fundraising/tools] - https://gerrit.wikimedia.org/r/683114 (owner: Eileen) [21:42:07] Jeff_Green jgleeson cstone confirmed that I'm able to consume on the donations queue using the civi-main.yaml, too [21:42:22] AndyRussG: woot! [21:42:23] woo [21:43:25] I did have to adjust the db settings for the fredge db, probably not ideal, but it's fine [21:43:38] working here also! [21:43:47] https://paste.toolforge.org/view/20bf0f2e [21:44:05] Had to use the root db user for the fredge db config [21:44:14] but that's just a question for local setup [21:44:36] I guess due to the range of things that use smashpig, we're gonna have to watch the logs pretty closely across the stack when it goes out. [21:44:38] also I noticed that on Docker Adyen redirects back to a Vagrant-y URL [21:45:19] jgleeson: yeah... though it also is not a huge change, just mainly a noice reformatting [21:46:10] oh hey, failmail [21:49:38] late to the party but can also confirm the queue consuming [21:50:03] ejegg: oh hmmm, btw eileen just deployed civi stuff eh [21:50:05] cstone: yay!! :) [21:50:20] cstone: you didn't get any fredge-db permission errors? [21:50:37] what did you set for the db user/pw for that? [21:50:50] ejegg: I think the failmail was at the moment of deploy [21:50:52] I didn't get any either AndyRussG [21:50:54] & then stopped [21:50:57] not that I noticed [21:51:14] - &FREDGE_DATABASE [21:51:16] class: PDO [21:51:18] constructor-parameters: [21:51:20] - 'mysql:host=database;dbname=fredge' [21:51:22] - 'smashpig' [21:53:10] PDOException@/srv/smashpig/Core/Configuration.php:181 (SQLSTATE[HY000] [1044] Access denied for user 'smashpig'@'%' to database 'fredge') [21:53:12] not sure why that works though as I have no local user called smashpig [21:54:00] jgleeson: it should be set up uhhh see lines 669-680 in setup.sh [21:54:35] docker@civicrm:/srv/civi-sites/wmff/drupal$ php /srv/smashpig/Maintenance/ConsumePendingQueue.php --queue pending --max-messages 1 [21:54:36] 2021-05-04T21:52:49+00:00 [ALERT ] {SmashPig-ConsumePendingQueue::SPCID-0498787604} Last chance exception handler fired. [21:54:41] yeah I do have it [21:54:47] was looking at the wrong db server [21:54:55] I don't have one with an empty pw tho [21:54:58] :| [21:55:06] jgleeson: yeahh I also tried with the correct password [21:55:12] which is what it should have, dockerpass [21:55:16] ok i am seeing that error [21:55:31] it works if i set the db user to root and no pw [21:55:41] oh hey I never tried running smash pig jobs [21:55:49] cstone jgleeson did you not get that error with a different queue consumer? how were you running them? [21:56:01] i didnt get that error with the emailpref or donations [21:56:15] yeah also e-mail pref worked fine [21:56:18] but they werent talking to fredge ? [21:56:31] heh no idea! [21:56:45] hmmmm [21:56:53] still in any case just to note not a prod thing Jeff_Green, only a local dev setup issue [21:57:20] gonna try directly on the mysql comman dline [21:57:22] ok [21:57:39] `drush @wmff cvapi Preferencesqueue.consume time_limit=1000 max_batch_size=1 -v` [21:58:11] AndyRussG oh hey, we should maybe update that db user? [21:58:12] please let me know when you guys are done testing, I'm not really following the specifics [21:58:13] drush @wmff qc -v [21:58:21] in fundraising-dev [21:58:31] for fredge [21:58:53] (CR) Ejegg: [C: +2] Merge branch 'master' into deployment [extensions/DonationInterface] (deployment) - https://gerrit.wikimedia.org/r/685077 (owner: Ejegg) [21:59:57] Jeff_Green: the config is working locally for us [22:00:02] I'd say we're good to go [22:00:10] great! [22:00:12] (Merged) jenkins-bot: Merge branch 'master' into deployment [extensions/DonationInterface] (deployment) - https://gerrit.wikimedia.org/r/685077 (owner: Ejegg) [22:00:46] but we could do with just keepin an eye on the logs in case something breaks as the test locally required us to replace a bunch of discrete config with the same host info [22:01:01] ok [22:01:33] it's going to take a me a few minutes to get it all checked in [22:02:03] (PS1) Ejegg: Delete log in link on payments + e-p-c wikis [wikimedia/fundraising/dev] - https://gerrit.wikimedia.org/r/685120 [22:02:22] right I'm out. Bye all [22:02:28] bye jgleeson [22:02:40] thanks for all the help jgleeson! [22:02:50] jgleeson|away: cya :) [22:03:21] (PS1) Ejegg: SmashPig: connect to fredge as 'drupal' [wikimedia/fundraising/dev] - https://gerrit.wikimedia.org/r/685121 [22:03:31] AndyRussG: two tiny patches for fundraising-dev ^^^ [22:03:35] (PS1) Eileen: Update phpmailer to 6.4.1 [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/685122 [22:03:59] (CR) Ejegg: [C: +2] Update phpmailer to 6.4.1 [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/685122 (owner: Eileen) [22:04:35] (PS1) Eileen: Update phpmailer to 6.4.1 [wikimedia/fundraising/SmashPig] - https://gerrit.wikimedia.org/r/685123 [22:08:32] ok starting the deploy [22:11:56] Jeff_Green: cool!!!!!! woohooo [22:11:59] ejegg|brb: thx! [22:12:25] it's deployed to frpig/civi/frdata and payments1001 so far [22:12:48] I'll do a test payment as soon as I get the other paymentses upgraded [22:15:22] that part looked normal [22:19:46] (Merged) jenkins-bot: Update phpmailer to 6.4.1 [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/685122 (owner: Eileen) [22:20:23] yay, and there's the TY letter [22:20:35] woo [22:20:37] ejegg: there is a second phpmailer patch on smash pig [22:22:25] (PS1) Eileen: Composer update for phpmailer to 6.4.1 [wikimedia/fundraising/crm/vendor] - https://gerrit.wikimedia.org/r/685128 [22:23:24] 685123 is for smashpig - I have the smashpig file in the vendor update - hopefully we don't have to do the whole tagging thing [22:24:26] (PS2) Ejegg: SmashPig: connect to fredge as 'drupal' [wikimedia/fundraising/dev] - https://gerrit.wikimedia.org/r/685121 [22:24:45] eileen: nope, no need to tag + sweep through [22:25:28] (CR) Ejegg: [V: +2 C: +2] Composer update for phpmailer to 6.4.1 [wikimedia/fundraising/crm/vendor] - https://gerrit.wikimedia.org/r/685128 (owner: Eileen) [22:26:13] (CR) Ejegg: [C: +2] Update phpmailer to 6.4.1 [wikimedia/fundraising/SmashPig] - https://gerrit.wikimedia.org/r/685123 (owner: Eileen) [22:26:52] (Merged) jenkins-bot: Update phpmailer to 6.4.1 [wikimedia/fundraising/SmashPig] - https://gerrit.wikimedia.org/r/685123 (owner: Eileen) [22:37:07] eileen: we are in tech-talk though not sure if it'll last btw :) [22:41:57] (Merged) jenkins-bot: Composer update for phpmailer to 6.4.1 [wikimedia/fundraising/crm/vendor] - https://gerrit.wikimedia.org/r/685128 (owner: Eileen) [22:49:23] (CR) Jforrester: [C: +2] Replace uses of DB_MASTER with DB_PRIMARY [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/685084 (owner: Umherirrender) [22:50:22] (PS1) Ejegg: Merge branch 'master' into deployment [wikimedia/fundraising/SmashPig] (deployment) - https://gerrit.wikimedia.org/r/685134 [22:51:24] (PS1) Ejegg: Update PHPMailer [wikimedia/fundraising/SmashPig/vendor] - https://gerrit.wikimedia.org/r/685135 [22:51:34] (CR) Ejegg: [C: +2] Update PHPMailer [wikimedia/fundraising/SmashPig/vendor] - https://gerrit.wikimedia.org/r/685135 (owner: Ejegg) [22:52:53] (PS2) Ejegg: Merge branch 'master' into deployment [wikimedia/fundraising/SmashPig] (deployment) - https://gerrit.wikimedia.org/r/685134 [23:05:16] (CR) Cstone: [C: +2] "drupal drupal works for me" [wikimedia/fundraising/dev] - https://gerrit.wikimedia.org/r/685121 (owner: Ejegg) [23:13:41] (PS1) Ejegg: WIP enable drupal syslog module on install [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/685137 [23:14:45] (Merged) jenkins-bot: Replace uses of DB_MASTER with DB_PRIMARY [extensions/CentralNotice] - https://gerrit.wikimedia.org/r/685084 (owner: Umherirrender) [23:20:47] (PS1) Eileen: Parse monolog through php [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/685138 [23:21:48] (PS2) Eileen: Parse monolog through php [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/685138 (https://phabricator.wikimedia.org/T279983) [23:24:25] Fundraising-Backlog, Wikimedia-Fundraising-CiviCRM, fr-email-preference-center: Email pref ctr: Set opt_in_source in consumer - https://phabricator.wikimedia.org/T281936 (Ejegg) [23:24:50] (PS3) Ejegg: Parse monolog through php [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/685138 (https://phabricator.wikimedia.org/T279983) (owner: Eileen) [23:25:07] (CR) Ejegg: [C: +2] Parse monolog through php [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/685138 (https://phabricator.wikimedia.org/T279983) (owner: Eileen) [23:26:51] (PS2) Ejegg: Update boilerplate code [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/684636 (https://phabricator.wikimedia.org/T281647) (owner: Eileen) [23:26:58] (CR) Ejegg: [C: +2] Update boilerplate code [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/684636 (https://phabricator.wikimedia.org/T281647) (owner: Eileen) [23:31:14] i'mma deploy the latest DI code to payments [23:31:20] including the 6.4.1 PHPMailer [23:33:20] cstone: it includes some of your soft descriptor updates too [23:33:36] all this stuff: https://gerrit.wikimedia.org/r/c/mediawiki/extensions/DonationInterface/+/685077 [23:34:17] thanks ejegg ! [23:42:22] i'm rolling the iptables changes for the frdata, civi, and frdev hosts now. they are all additive so should have no ill effect. [23:44:44] (Merged) jenkins-bot: Parse monolog through php [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/685138 (https://phabricator.wikimedia.org/T279983) (owner: Eileen) [23:44:53] (Merged) jenkins-bot: Update boilerplate code [wikimedia/fundraising/crm] - https://gerrit.wikimedia.org/r/684636 (https://phabricator.wikimedia.org/T281647) (owner: Eileen) [23:49:37] ok. now rolling the frqueue ones. same thing, should be no effect.