Handle canMatchSearchAfter for frozen context scenario #11249
Merged
Conversation
This file contains 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
gashutos
requested review from
abbashus,
adnapibar,
anasalkouz,
andrross,
Bukhtawar,
CEHENKLE,
dblock,
dbwiddis,
dreamer-89,
gbbafna,
kartg,
kotwanikunal,
mch2,
msfroh,
nknize,
owaiskazi19,
peternied,
reta,
Rishikesh1159,
ryanbogan,
sachinpkale,
saratvemulapalli,
setiah,
shwetathareja,
sohami,
tlfeng and
VachaShah
as code owners
Signed-off-by: Chaitanya Gohel <gashutos@amazon.com>
|
❕ Gradle check result for a615371: UNSTABLE
Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure. |
|
❌ Gradle check result for 7b8eeec: FAILURE Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change? |
Those are indeed flaky till we get it to 2.12 (backport) |
Signed-off-by: Chaitanya Gohel <gashutos@amazon.com>
noCharger
approved these changes
Nov 20, 2023
|
@gashutos sorry but we have merge conflict here ... |
Signed-off-by: Chaitanya Gohel <104654647+gashutos@users.noreply.github.com>
Oops, resolved just now. |
|
❌ Gradle check result for d552d15: FAILURE Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change? |
|
❌ Gradle check result for d552d15: Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change? |
|
❕ Gradle check result for d552d15: UNSTABLE
Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure. |
|
The backport to To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.x
# Create a new branch
git switch --create backport/backport-11249-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 280f6e488c97e7e4429472b100713d8b7231f38a
# Push it to GitHub
git push --set-upstream origin backport/backport-11249-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.xThen, create a pull request where the |
|
@gashutos could you please manually backport to |
gashutos
added a commit
to gashutos/OpenSearch
that referenced
this pull request
Nov 21, 2023
…oject#11249) * Handle canMatchSearchAfter for frozen context scenario Signed-off-by: Chaitanya Gohel <gashutos@amazon.com> * Addressig review comments Signed-off-by: Chaitanya Gohel <gashutos@amazon.com> * Enable test for 2.12.0 for nano date now Signed-off-by: Chaitanya Gohel <gashutos@amazon.com> --------- Signed-off-by: Chaitanya Gohel <gashutos@amazon.com> Signed-off-by: Chaitanya Gohel <104654647+gashutos@users.noreply.github.com>
This was referenced Nov 21, 2023
This was referenced Nov 28, 2023
fahadshamiinsta
pushed a commit
to fahadshamiinsta/OpenSearch270
that referenced
this pull request
Dec 4, 2023
…oject#11249) * Handle canMatchSearchAfter for frozen context scenario Signed-off-by: Chaitanya Gohel <gashutos@amazon.com> * Addressig review comments Signed-off-by: Chaitanya Gohel <gashutos@amazon.com> * Enable test for 2.12.0 for nano date now Signed-off-by: Chaitanya Gohel <gashutos@amazon.com> --------- Signed-off-by: Chaitanya Gohel <gashutos@amazon.com> Signed-off-by: Chaitanya Gohel <104654647+gashutos@users.noreply.github.com>
|
Using the latest docker version (opensearchproject/opensearch:latest) fails with this error. Curiously the latest version of the AWS service does not. |
|
The latest image is This fix will be available in 2.12 release -> schedule. For AWS managed OpenSearch services, we have different release schedule and we patched this fix to 2.11 AOS version itself. |
rayshrey
pushed a commit
to rayshrey/OpenSearch
that referenced
this pull request
Mar 18, 2024
…oject#11249) * Handle canMatchSearchAfter for frozen context scenario Signed-off-by: Chaitanya Gohel <gashutos@amazon.com> * Addressig review comments Signed-off-by: Chaitanya Gohel <gashutos@amazon.com> * Enable test for 2.12.0 for nano date now Signed-off-by: Chaitanya Gohel <gashutos@amazon.com> --------- Signed-off-by: Chaitanya Gohel <gashutos@amazon.com> Signed-off-by: Chaitanya Gohel <104654647+gashutos@users.noreply.github.com>
shiv0408
pushed a commit
to Gaurav614/OpenSearch
that referenced
this pull request
Apr 25, 2024
…oject#11249) * Handle canMatchSearchAfter for frozen context scenario Signed-off-by: Chaitanya Gohel <gashutos@amazon.com> * Addressig review comments Signed-off-by: Chaitanya Gohel <gashutos@amazon.com> * Enable test for 2.12.0 for nano date now Signed-off-by: Chaitanya Gohel <gashutos@amazon.com> --------- Signed-off-by: Chaitanya Gohel <gashutos@amazon.com> Signed-off-by: Chaitanya Gohel <104654647+gashutos@users.noreply.github.com> Signed-off-by: Shivansh Arora <hishiv@amazon.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
There is a corner case where sort is failing on nested field after this PR #7453. When nested field is
datetype and havefilterin nested field hasnow()function call.OpenSearch prevents SortFields' initialization in such cases more then one time.
This is very corner scenario but I added integ tests for that as we didn't have any integ test.
As a mitigation, I am pssing already initialized
SortAndFormatsin ContextIndexSearcher in this PR. In fact I also made change to invoke thatif clauseonly if SearchContext contains searchAfter.This happens only when nested_sort is having date field type and filter is having range along with now(). Culprit is the now() call that Opensearch is trying to avoid since now() should get called only once.
How to repro the issue
This search query failes with below Exception,
Server side traces are corelated with canMatchSearchAfter where we are trying to initialize SortAndFormats again to get MinMax values.
Related Issues
Resolves #11248
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.