MOD-9222: Fix strict timeout result aggregation#5844
Merged
Conversation
kei-nan
approved these changes
Mar 30, 2025
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #5844 +/- ##
=======================================
Coverage 87.05% 87.05%
=======================================
Files 211 211
Lines 37788 37789 +1
Branches 1229 1229
=======================================
+ Hits 32895 32898 +3
+ Misses 4888 4886 -2
Partials 5 5 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Contributor
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin 2.8
git worktree add -d .worktree/backport-5844-to-2.8 origin/2.8
cd .worktree/backport-5844-to-2.8
git switch --create backport-5844-to-2.8
git cherry-pick -x 279182f7d768679bc9416a75f822727e94c4cc9f |
Contributor
|
Successfully created backport PR for |
redisearch-backport-pull-request bot
pushed a commit
that referenced
this pull request
Apr 2, 2025
Fix strict timeout result aggregation (cherry picked from commit 279182f)
Contributor
|
Successfully created backport PR for |
redisearch-backport-pull-request bot
pushed a commit
that referenced
this pull request
Apr 2, 2025
Fix strict timeout result aggregation (cherry picked from commit 279182f)
github-merge-queue bot
pushed a commit
that referenced
this pull request
Apr 2, 2025
MOD-9222: Fix strict timeout result aggregation (#5844) Fix strict timeout result aggregation (cherry picked from commit 279182f) Co-authored-by: Raz Monsonego <[email protected]>
raz-mon
added a commit
that referenced
this pull request
Apr 3, 2025
Fix strict timeout result aggregation
github-merge-queue bot
pushed a commit
that referenced
this pull request
Apr 20, 2025
MOD-9222: Fix strict timeout result aggregation (#5844) Fix strict timeout result aggregation (cherry picked from commit 279182f) Co-authored-by: Raz Monsonego <[email protected]> Co-authored-by: raz-mon <[email protected]>
JoanFM
pushed a commit
that referenced
this pull request
May 27, 2025
Fix strict timeout result aggregation
JoanFM
pushed a commit
that referenced
this pull request
May 27, 2025
Fix strict timeout result aggregation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR fixes the aggregation of results when using strict timeout policy together with the safe-loader (i.e., multi-threading).
Specifically, the decrement of the
resultsLimitwas done too early, such that the safe-loader saw an already-decremented value, thus fetching one less result than needed.The decrement was moved to the body of the loop, in case the
Next()call succeeded, i.e.,RS_RESULT_OKwas returned from the pipeline.A test was already encountering this bug, but was changed to use the non-strict timeout policy, thus hiding the bug. This setting was removed from the test, such that now it will use the strict timeout policy and test this behavior (Cursor + MT).