[2.8] CP TIMEOUT related bugs & Query Debug Mechanism#5788
Merged
Conversation
- discard all coord/srd/module.c changed - debug_command support only FT. commands, and not _FT. commands - discard internal_only option, including COORDINATOR_FORCED_TIMEOUT isClusterCoord - dist aggregate: discard split distrubeted commd tests: - removed testTimeoutPartialWithEmptyResults as it should test the bug with the debug command in cluster mode, but this command is not supported test_resp3: test_error_with_partial_results give a flaky version for cluster and a stable one for SA WIP: test_timeout, test_cursors: ,odify to clster as well log it didn't find RPINDEX
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## 2.8 #5788 +/- ##
==========================================
+ Coverage 86.06% 86.09% +0.03%
==========================================
Files 200 201 +1
Lines 34386 34532 +146
==========================================
+ Hits 29593 29731 +138
- Misses 4793 4801 +8 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
test timeout - skip on cluster test_resp3:test_error_with_partial_results handle cluster test_cursors:testTimeoutPartialWithEmptyResults : NOT MERGED test_debug_commands: add messages move verifyResultsResp3 to common
Collaborator
Author
|
here as a reminder to CP the follow up PR: |
meiravgri
changed the title
alonre24
approved these changes
Mar 20, 2025
Collaborator
alonre24
left a comment
alonre24
left a comment
There was a problem hiding this comment.
Reviewd compared to the backport to 2.10 and the expected diffs described in the PR description. All looks as expected
GuyAv46
approved these changes
Mar 20, 2025
Collaborator
Author
|
/backport |
Contributor
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin 2.6
git worktree add -d .worktree/backport-5788-to-2.6 origin/2.6
cd .worktree/backport-5788-to-2.6
git switch --create backport-5788-to-2.6
git cherry-pick -x e3553ef7ac4889c2684e6b0a893bc5252f7e9e0b |
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.
Cherry-pick PR #5734 (2.10 → 2.8)
fixing:
MOD-8483, MOD-8482, MOD-8515, MOD-8606, MOD-8794
debug query mechanism mod:
MOD-8605
Background
This PR cherry-picks PR #5734 to 2.8, which previously cherry-picked PR #5554 to 2.10, since 2.10 is structurally closer to 2.8 than master.
However, 2.8 does not support
FT.DEBUGin coordinator mode, so the query debug mechanism is only available in standalone mode. This required removing certain coordinator-related code that was included in the original PR.Key Adjustments for 2.8
Discarded Code
coord/src/module.c.FT.SEARCH/FT.AGGREGATEcommands._FT.SEARCH/_FT.AGGREGATEcommands (used for coordinator-shard communication).dist_aggregate.c.COORDINATOR_FORCED_TIMEOUT.isClusterCoord.Test Adjustments
testTimeoutPartialWithEmptyResultsgetNextReplybefore the timeout elapsed, while the shard returns empty results—this is not possible to control without the debug mechanism, which 2.8 lacks.test_resp3: test_error_with_partial_resultstest_timeouttest_debug_commands:TestQueryDebugCommands_MTtests asWORKER_THREADScan't be configured after env setup in 2.8, making them messy, and MT isn't critical for this scenario.verifyResultsResp3