Skip to content

[MOD-11817] FT.AGGREGATE show Background Indexing OOM warning#7141

Merged
lerman25 merged 6 commits intomasterfrom
omerl-aggreagte-oom-warning
Oct 26, 2025
Merged

[MOD-11817] FT.AGGREGATE show Background Indexing OOM warning#7141
lerman25 merged 6 commits intomasterfrom
omerl-aggreagte-oom-warning

Conversation

@lerman25
Copy link
Collaborator

@lerman25 lerman25 commented Oct 23, 2025

Currently, Background indexing OOM warning doesn't propagate properly in FT.AGGREGATE in RESP3.
This PR fixes this by adding the missing check in rpnetNext.
This PR also does slight refactoring in test_index_oom.py file and related functions in common.py.


Note

Propagates background-indexing OOM warnings from shards to coordinator and surfaces them in RESP3 FT.AGGREGATE, with tests and utility timeouts.

  • Aggregate (RESP3):
    • Include QUERY_WINDEXING_FAILURE in warning when either qctx->bgScanOOM or sctx->spec->scan_failed_OOM.
  • Coordinator (rpnet):
    • Parse shard warning and set AREQ_QueryProcessingCtx(...)->bgScanOOM = true on QUERY_WINDEXING_FAILURE.
  • Core context:
    • Add bool bgScanOOM to QueryProcessingCtx.
  • Tests:
    • Add RESP3 warning assertions for FT.AGGREGATE (and extend SEARCH/PROFILE checks).
    • Refactor tests to use a shared info_modules_oom_count_str and adjust env setup for certain tests.
    • Add time-limited waits in common.py (waitForIndex* helpers) to prevent infinite loops.

Written by Cursor Bugbot for commit 58cb344. This will update automatically on new commits. Configure here.

@cursor
Copy link

cursor bot commented Oct 23, 2025

Bug: Cluster Decorator Conflicts with Test Environment

The @skip(cluster=False) decorator on test_cluster_oom_all_shards and test_cluster_oom_single_shard causes these tests to run only in cluster mode. This conflicts with the tests' explicit creation of their own cluster environments, which might lead to unintended skipping.

Additional Locations (1)

Fix in Cursor Fix in Web

@codecov
Copy link

codecov bot commented Oct 23, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 85.56%. Comparing base (d343ba8) to head (58cb344).
⚠️ Report is 16 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #7141      +/-   ##
==========================================
- Coverage   85.58%   85.56%   -0.03%     
==========================================
  Files         327      327              
  Lines       51985    51987       +2     
  Branches    11133    11133              
==========================================
- Hits        44492    44481      -11     
- Misses       7325     7338      +13     
  Partials      168      168              
Flag Coverage Δ
flow 84.28% <100.00%> (-0.14%) ⬇️
unit 51.74% <0.00%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@lerman25 lerman25 added this pull request to the merge queue Oct 26, 2025
Merged via the queue into master with commit 49a986c Oct 26, 2025
31 checks passed
@lerman25 lerman25 deleted the omerl-aggreagte-oom-warning branch October 26, 2025 13:27
@redisearch-backport-pull-request
Copy link
Contributor

Backport failed for 2.8, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin 2.8
git worktree add -d .worktree/backport-7141-to-2.8 origin/2.8
cd .worktree/backport-7141-to-2.8
git switch --create backport-7141-to-2.8
git cherry-pick -x 49a986ce7d3baadfae8c0dc7d15bb3afdf20dca1

@redisearch-backport-pull-request
Copy link
Contributor

Backport failed for 2.10, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin 2.10
git worktree add -d .worktree/backport-7141-to-2.10 origin/2.10
cd .worktree/backport-7141-to-2.10
git switch --create backport-7141-to-2.10
git cherry-pick -x 49a986ce7d3baadfae8c0dc7d15bb3afdf20dca1

@redisearch-backport-pull-request
Copy link
Contributor

Backport failed for 8.2, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin 8.2
git worktree add -d .worktree/backport-7141-to-8.2 origin/8.2
cd .worktree/backport-7141-to-8.2
git switch --create backport-7141-to-8.2
git cherry-pick -x 49a986ce7d3baadfae8c0dc7d15bb3afdf20dca1

redisearch-backport-pull-request bot pushed a commit that referenced this pull request Oct 26, 2025
* Check aggregate in verbosity test

* check verbosity in tests

* Check bg scan warning and raise accordingly

* Refractor tests

* Add comment

* fix comment

(cherry picked from commit 49a986c)
@redisearch-backport-pull-request
Copy link
Contributor

Successfully created backport PR for 8.4:

lerman25 added a commit that referenced this pull request Oct 26, 2025
* Check aggregate in verbosity test

* check verbosity in tests

* Check bg scan warning and raise accordingly

* Refractor tests

* Add comment

* fix comment

(cherry picked from commit 49a986c)
lerman25 added a commit that referenced this pull request Oct 26, 2025
* Check aggregate in verbosity test

* check verbosity in tests

* Check bg scan warning and raise accordingly

* Refractor tests

* Add comment

* fix comment

(cherry picked from commit 49a986c)
(cherry picked from commit 3129614)
lerman25 added a commit that referenced this pull request Oct 26, 2025
* Check aggregate in verbosity test

* check verbosity in tests

* Check bg scan warning and raise accordingly

* Refractor tests

* Add comment

* fix comment

(cherry picked from commit 49a986c)
(cherry picked from commit 3129614)
(cherry picked from commit 95d3916)
lerman25 added a commit that referenced this pull request Oct 27, 2025
* Check aggregate in verbosity test

* check verbosity in tests

* Check bg scan warning and raise accordingly

* Refractor tests

* Add comment

* fix comment

(cherry picked from commit 49a986c)
github-merge-queue bot pushed a commit that referenced this pull request Oct 27, 2025
…7154)

[MOD-11817] FT.AGGREGATE show Background Indexing OOM warning (#7141)

* Check aggregate in verbosity test

* check verbosity in tests

* Check bg scan warning and raise accordingly

* Refractor tests

* Add comment

* fix comment

(cherry picked from commit 49a986c)
github-merge-queue bot pushed a commit that referenced this pull request Oct 27, 2025
…7153)

[MOD-11817] FT.AGGREGATE show Background Indexing OOM warning (#7141)

* Check aggregate in verbosity test

* check verbosity in tests

* Check bg scan warning and raise accordingly

* Refractor tests

* Add comment

* fix comment

(cherry picked from commit 49a986c)

Co-authored-by: lerman25 <[email protected]>
chesedo pushed a commit that referenced this pull request Oct 27, 2025
* Check aggregate in verbosity test

* check verbosity in tests

* Check bg scan warning and raise accordingly

* Refractor tests

* Add comment

* fix comment
github-merge-queue bot pushed a commit that referenced this pull request Oct 29, 2025
…7157)

* [MOD-11817] FT.AGGREGATE show Background Indexing OOM warning (#7141)

* Check aggregate in verbosity test

* check verbosity in tests

* Check bg scan warning and raise accordingly

* Refractor tests

* Add comment

* fix comment

(cherry picked from commit 49a986c)
(cherry picked from commit 3129614)
(cherry picked from commit 95d3916)

* fix tests
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants