Skip to content

MOD-9612: Do not check for early timeouts in non-strict timeout policy#6108

Merged
raz-mon merged 3 commits intomasterfrom
razmon-timeout_fix_2
May 8, 2025
Merged

MOD-9612: Do not check for early timeouts in non-strict timeout policy#6108
raz-mon merged 3 commits intomasterfrom
razmon-timeout_fix_2

Conversation

@raz-mon
Copy link
Collaborator

@raz-mon raz-mon commented May 8, 2025

This PR skips the early timeout check we perform between building the iterator tree and building the pipeline.
In this way - we will still fail early upon using the strict timeout policy, but will continue to fail (stop collecting results, and return the collected ones) a bit later in case of non-strict timeout policy.

Related #6100

alonre24
alonre24 previously approved these changes May 8, 2025
oshadmi
oshadmi previously approved these changes May 8, 2025
Copy link
Collaborator

@oshadmi oshadmi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great!

@raz-mon raz-mon dismissed stale reviews from oshadmi and alonre24 via 271ff8c May 8, 2025 14:03
@codecov
Copy link

codecov bot commented May 8, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 87.19%. Comparing base (4e04202) to head (271ff8c).
Report is 1 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #6108      +/-   ##
==========================================
- Coverage   87.19%   87.19%   -0.01%     
==========================================
  Files         198      198              
  Lines       36051    36052       +1     
==========================================
- Hits        31435    31434       -1     
- Misses       4616     4618       +2     
Flag Coverage Δ
flow 82.61% <100.00%> (-0.13%) ⬇️
unit 40.46% <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.

@raz-mon raz-mon added this pull request to the merge queue May 8, 2025
Merged via the queue into master with commit 0e11efa May 8, 2025
13 checks passed
@raz-mon raz-mon deleted the razmon-timeout_fix_2 branch May 8, 2025 16:08
@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-6108-to-2.8 origin/2.8
cd .worktree/backport-6108-to-2.8
git switch --create backport-6108-to-2.8
git cherry-pick -x 0e11efa39f21bf740ca741778b1a51b8ea11c3ef

@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-6108-to-2.10 origin/2.10
cd .worktree/backport-6108-to-2.10
git switch --create backport-6108-to-2.10
git cherry-pick -x 0e11efa39f21bf740ca741778b1a51b8ea11c3ef

@redisearch-backport-pull-request
Copy link
Contributor

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

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

git fetch origin 8.0
git worktree add -d .worktree/backport-6108-to-8.0 origin/8.0
cd .worktree/backport-6108-to-8.0
git switch --create backport-6108-to-8.0
git cherry-pick -x 0e11efa39f21bf740ca741778b1a51b8ea11c3ef

raz-mon added a commit that referenced this pull request May 8, 2025
#6108)

* Revert "MOD-9612: Fix flaky test and change early timeout error message (#6100)"

This reverts commit 4e04202.

* Do not check for early timeouts in non-strict policy

* Fix tests
raz-mon added a commit that referenced this pull request May 8, 2025
#6108)

* Revert "MOD-9612: Fix flaky test and change early timeout error message (#6100)"

This reverts commit 4e04202.

* Do not check for early timeouts in non-strict policy

* Fix tests
raz-mon added a commit that referenced this pull request May 8, 2025
#6108)

* Revert "MOD-9612: Fix flaky test and change early timeout error message (#6100)"

This reverts commit 4e04202.

* Do not check for early timeouts in non-strict policy

* Fix tests
nafraf pushed a commit that referenced this pull request May 13, 2025
#6108)

* Revert "MOD-9612: Fix flaky test and change early timeout error message (#6100)"

This reverts commit 4e04202.

* Do not check for early timeouts in non-strict policy

* Fix tests
github-merge-queue bot pushed a commit that referenced this pull request May 13, 2025
…t policy (#6112)

MOD-9612: Do not check for early timeouts in non-strict timeout policy (#6108)

* Revert "MOD-9612: Fix flaky test and change early timeout error message (#6100)"

This reverts commit 4e04202.

* Do not check for early timeouts in non-strict policy

* Fix tests
github-merge-queue bot pushed a commit that referenced this pull request May 13, 2025
… policy (#6111)

MOD-9612: Do not check for early timeouts in non-strict timeout policy (#6108)

* Revert "MOD-9612: Fix flaky test and change early timeout error message (#6100)"

This reverts commit 4e04202.

* Do not check for early timeouts in non-strict policy

* Fix tests
github-merge-queue bot pushed a commit that referenced this pull request May 14, 2025
… policy (#6113)

MOD-9612: Do not check for early timeouts in non-strict timeout policy (#6108)

* Revert "MOD-9612: Fix flaky test and change early timeout error message (#6100)"

This reverts commit 4e04202.

* Do not check for early timeouts in non-strict policy

* Fix tests
JoanFM pushed a commit that referenced this pull request May 27, 2025
#6108)

* Revert "MOD-9612: Fix flaky test and change early timeout error message (#6100)"

This reverts commit 4e04202.

* Do not check for early timeouts in non-strict policy

* Fix tests
JoanFM pushed a commit that referenced this pull request May 27, 2025
#6108)

* Revert "MOD-9612: Fix flaky test and change early timeout error message (#6100)"

This reverts commit 4e04202.

* Do not check for early timeouts in non-strict policy

* 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.

3 participants