UPSTREAM FIX

magento2-40643: Setup:upgrade recreating every indexer trigger on each run

Community fix magento2-40643 merged into magento/magento2 on 2026-06-16, not in a release yet; applies cleanly to 7 releases from 2.4.8 to 2.4.9.

Fixes setup:upgrade recreating every indexer trigger on each run edited

Pull request title: setup:upgrade is changing indexer mode to `save` from `schedule` slowing it down immensely
Pull request: magento/magento2#40643
Issues: #33386 human
Author: @Nuranto
Merged: 2026-06-16
Fixed in: no release yet
Reported on: —
Categories: Performance
Components: magento/framework, magento/module-indexer

Labels

Area: Framework, Performance
Component: —
Priority: P2
Severity: —
Reported on (labels): 2.4.x

Issue

Title and steps come from the upstream issue and pull request.

Description

1. setup:upgrade is always recreating the triggers causing huge downtime during the command execution
2. sometimes the indexers never revert back to the scheduled mode and stay on save mode

Steps to reproduce

1. A fairly large catalog with lots of categories (over 5000) and products (over 60k with over 200 attributes)
2. The indexers set on schedule mode.
3. Execute setup:upgrade

Expected result

1. I expect that setup:upgrade finishes fast and doesn't recreate the triggers if it's not needed. If the trigger exists, it shouldn't drop and recreate it. Only If it does not exist should it create it.
2. It should never change the mode from schedule to save. The user has put it for a reason there

Actual result

1. setup:upgrade is always recreating the triggers causing huge downtime during the command execution
2. sometimes the indexers never revert back to the scheduled mode and stay on save mode

### Additional Information
- Confirmation note, AC, and suggested approach https://github.com/magento/magento2/issues/33386#issuecomment-1043290448

---
Please provide [Severity](https://devdocs.magento.com/guides/v2.4/contributor-guide/contributing.html#backlog) assessment for the Issue as Reporter. This information will help during Confirmation and Issue triage processes.

- [X] Severity: S0 _- Affects critical data or functionality and leaves users without workaround._
- [ ] Severity: S1 _- Affects critical data or functionality and forces users to employ a workaround._
- [ ] Severity: S2 _- Affects non-critical data or functionality and forces users to employ a workaround._
- [ ] Severity: S3 _- Affects non-critical data or functionality and does not force users to employ a workaround._
- [ ] Severity: S4 _- Affects aesthetics, professional look and feel, “quality” or “usability”._

Taken from the upstream issue.

Code match per tag

Each tag was checked with git apply --check against that tag's files. A clean match means the change applies; it is not a test result. Tags that already contain the fix are marked.

Line	Code match per tag	Tests
2.4.6	2.4.6 conflict 2.4.6-p1 conflict 2.4.6-p2 conflict 2.4.6-p3 conflict 2.4.6-p4 conflict 2.4.6-p5 conflict 2.4.6-p6 conflict 2.4.6-p7 conflict 2.4.6-p8 conflict 2.4.6-p9 conflict 2.4.6-p10 conflict 2.4.6-p11 conflict 2.4.6-p12 conflict 2.4.6-p13 conflict 2.4.6-p14 conflict 2.4.6-p15 conflict	2.4.6: no test data 2.4.6-p1: no test data 2.4.6-p2: no test data 2.4.6-p3: no test data 2.4.6-p4: no test data 2.4.6-p5: no test data 2.4.6-p6: no test data 2.4.6-p7: no test data 2.4.6-p8: no test data 2.4.6-p9: no test data 2.4.6-p10: no test data 2.4.6-p11: no test data 2.4.6-p12: no test data 2.4.6-p13: no test data 2.4.6-p14: no test data 2.4.6-p15: no test data
2.4.7	2.4.7 conflict 2.4.7-p1 conflict 2.4.7-p2 conflict 2.4.7-p3 conflict 2.4.7-p4 conflict 2.4.7-p5 conflict 2.4.7-p6 conflict 2.4.7-p7 conflict 2.4.7-p8 conflict 2.4.7-p9 conflict 2.4.7-p10 conflict	2.4.7: no test data 2.4.7-p1: no test data 2.4.7-p2: no test data 2.4.7-p3: no test data 2.4.7-p4: no test data 2.4.7-p5: no test data 2.4.7-p6: no test data 2.4.7-p7: no test data 2.4.7-p8: no test data 2.4.7-p9: no test data 2.4.7-p10: no test data
2.4.8	2.4.8 clean 2.4.8-p1 clean 2.4.8-p2 clean 2.4.8-p3 clean 2.4.8-p4 clean 2.4.8-p5 clean	2.4.8: no test data 2.4.8-p1: no test data 2.4.8-p2: no test data 2.4.8-p3: no test data 2.4.8-p4: no test data 2.4.8-p5: test files do not apply to this releaseunit: could not run before, could not run after
2.4.9	2.4.9 clean	2.4.9: fails before, passes afterunit: fails before, passes after

Triage

Model @cf/cloudflare/clef. Probability this is a bug fix: 96.0%. Probability it is security relevant: 0.6%.

Show the model's answers and probabilities

Question	Answer	Probabilities	Confidence
Change kind	bugfix	bugfix 92.2%, refactor 5.0%, tests_only 1.0%, feature 0.9%, dependency 0.5%, docs_only 0.3%	82.4%
Area	framework	framework 86.1%, other 4.1%, catalog 3.5%	71.0%
Reported version	2.4.1	2.4.1 59.5%, 2.4.1-p1 4.4%, unspecified 1.3%	35.0%
Scope	1.16 of 2	1 52.8%, 2 31.8%, 0 15.4%	10.5%
Risk	1.22 of 2	2 46.1%, 1 29.6%, 0 24.3%	3.9%
Worth backporting	1.41 of 2	2 53.2%, 1 34.9%, 0 11.8%	12.9%

Download

For cweagans/composer-patches, choose a version below and download the bundle. Copy its magento2-40643/ folder into patches/composer/, merge composer.patches.json into composer.json, then run composer install. Test files are always removed; paths are relative to each package root, using the default -p1 level.

Bundle README (what the ZIP ships)

# magento2-40643

Community fix merged upstream into magento/magento2, adapted by magento.watch.
This is not a patch published by Adobe.

Pull request: https://github.com/magento/magento2/pull/40643
Issue: https://github.com/magento/magento2/issues/33386
Author: @Nuranto
Source commit: 2cdef1bda18221afb1a4556162ea37d4f6a1fd1b
Modifications: test files and documentation removed, paths rewritten relative to each Composer package.
Licence: OSL-3.0 / AFL-3.0, as the original Magento Open Source code.
Maintainer: Łukasz Bajsarowicz (@lbajsarowicz)

Licence: Magento Open Source code under OSL-3.0 and AFL-3.0. The bundle carries the original author, source commit and the list of modifications.