brennen opened https://gitlab.wikimedia.org/repos/phabricator/phabricator/-/merge_requests/99

Merge Phorge upstream master as of 2025-09-08 into wmf/stable

brennen opened https://gitlab.wikimedia.org/repos/phabricator/arcanist/-/merge_requests/5

Merge upstream Phorge master as of 2025-09-08 into wmf/stable

brennen opened https://gitlab.wikimedia.org/repos/phabricator/deployment/-/merge_requests/80

update submodules to recent phorge upstream master (2025-09-08)

• test deploy on VPS-project-devtools: https://phabricator.wmcloud.org/

I'm not 100% sure that it's related to this task (though the timings suggest that it might be); but FYI, since a few days ago, fulltext global searches have failed for me on the test Phab instance with the following error (which appears to be distinct from T403948):

- AphrontMalformedRequestException: You are trying to save some data to permanent storage, but the request your browser made included an incorrect token. Reload the page and try again. You may need to clear your cookies.
  This was a Web request.
  This request had no CSRF token.

The search failure on the test instance might be related to accidentally removing a custom downstream change in src/infrastructure/cluster/search/PhabricatorSearchService.php due to rebase conflicts. That downstream change was part of bigger rPHABe95157e39bf532b695624a65b242ce0043e74e7f (which might be worth to revert completely but that's another story).

So basically, I'd like to try putting back in (keeping / not touching) this:

diff --git a/src/infrastructure/cluster/search/PhabricatorSearchService.php b/src/infrastructure/cluster/search/PhabricatorSearchService.php
index 073f9ffab6..0a9a76d5a7 100644
--- a/src/infrastructure/cluster/search/PhabricatorSearchService.php
+++ b/src/infrastructure/cluster/search/PhabricatorSearchService.php
@@ -259,17 +262,17 @@ class PhabricatorSearchService
 
       try {
         $engine = $service->getEngine();
-        $phids = $engine->executeSearch($query);
-
-        return id(new PhabricatorFulltextResultSet())
-          ->setPHIDs($phids)
-          ->setFulltextTokens($engine->getFulltextTokens());
+        $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
+        $result = $engine->executeSearch($query);
+        unset($unguarded);
+        return $result;
       } catch (PhutilSearchQueryCompilerSyntaxException $ex) {
         // If there's a query compilation error, return it directly to the
         // user: they issued a query with bad syntax.
         throw $ex;
       } catch (Exception $ex) {
         $exceptions[] = $ex;
+        phlog($ex);
       }
     }
     $msg = pht('All of the configured Fulltext Search services failed.');

Confirming that the CSFR search failure on the test instance got fixed by brennen deploying https://gitlab.wikimedia.org/repos/phabricator/phabricator/-/merge_requests/99/diffs?commit_id=dfc6e9023749144fa1c7d2385a16cb9624de8bed

Note that the "All Fulltext Search hosts failed" search failure (different error message) is covered in T403948 instead.
I had to edit/fix https://phabricator.wmcloud.org/config/edit/cluster.search/ again to avoid that second error.

Planning a deploy in the upcoming window.

brennen merged https://gitlab.wikimedia.org/repos/phabricator/phabricator/-/merge_requests/99

Merge Phorge upstream master as of 2025-09-08 into wmf/stable

brennen merged https://gitlab.wikimedia.org/repos/phabricator/arcanist/-/merge_requests/5

Merge upstream Phorge master as of 2025-09-08 into wmf/stable

brennen merged https://gitlab.wikimedia.org/repos/phabricator/deployment/-/merge_requests/80

update submodules to recent phorge upstream master (2025-09-08)

Planning a deploy in the upcoming window.

Scratch that. This is a slightly higher risk deploy than typical weekly ones, and the datacenter switchover is currently ongoing. After conversation with @Jelto, we've decided to push this until Thursday 2025-09-25.

Change #1190699 had a related patch set uploaded (by Pppery; author: Pppery):

[phabricator/translations@wmf/stable] Update source strings to latest release

https://gerrit.wikimedia.org/r/1190699

Icinga downtime and Alertmanager silence (ID=2cd14582-9d20-4866-92ef-9d1d830b7d8e) set by jelto@cumin1003 for 0:30:00 on 1 host(s) and their services with reason: Phabricator deploy

phab2002.codfw.wmnet

Icinga downtime and Alertmanager silence (ID=b53b2083-98fa-4f67-b9d4-da58c0b3f92d) set by jelto@cumin1003 for 0:30:00 on 1 host(s) and their services with reason: Phabricator deploy

phab1004.eqiad.wmnet

Mentioned in SAL (#wikimedia-operations) [2025-09-25T15:05:47Z] <brennen@deploy1003> Started deploy [phabricator/deployment@5d4a2bb]: deploy phab2002 for T404134

Mentioned in SAL (#wikimedia-operations) [2025-09-25T15:06:28Z] <brennen@deploy1003> Finished deploy [phabricator/deployment@5d4a2bb]: deploy phab2002 for T404134 (duration: 00m 41s)

Mentioned in SAL (#wikimedia-operations) [2025-09-25T15:11:04Z] <brennen@deploy1003> Started deploy [phabricator/deployment@5d4a2bb]: deploy phab1004 for T404134

Mentioned in SAL (#wikimedia-operations) [2025-09-25T15:14:53Z] <brennen@deploy1003> Finished deploy [phabricator/deployment@5d4a2bb]: deploy phab1004 for T404134 (duration: 03m 49s)

Change #1190699 merged by Aklapper:

[phabricator/translations@wmf/stable] Update source strings to latest release

https://gerrit.wikimedia.org/r/1190699

Change #1193538 had a related patch set uploaded (by Pppery; author: Pppery):

[phabricator/translations@wmf/stable] Update translations

https://gerrit.wikimedia.org/r/1193538

Change #1193538 merged by Aklapper:

[phabricator/translations@wmf/stable] Update translations

https://gerrit.wikimedia.org/r/1193538